From 8eb4dd420755ce199ef4071e34e60cb9c1c12b29 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Tue, 18 Mar 2025 09:59:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0=E5=92=8C=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/machinery/machinery/index.ts | 4 +-- src/api/machinery/machinery/types.ts | 6 +--- src/api/machinery/machineryDetail/index.ts | 4 +-- src/api/machinery/machineryDetail/types.ts | 6 +--- src/api/materials/company/index.ts | 4 +-- src/api/materials/company/types.ts | 6 +--- src/api/materials/materials/index.ts | 4 +-- src/api/materials/materials/types.ts | 6 +--- src/api/materials/materialsInventory/index.ts | 9 ++---- src/api/materials/materialsInventory/types.ts | 6 +--- src/api/project/constructionUser/index.ts | 4 +-- src/api/project/constructionUser/types.ts | 6 +--- src/api/project/contractor/index.ts | 4 +-- src/api/project/contractor/types.ts | 6 +--- src/api/project/project/index.ts | 4 +-- src/api/project/project/types.ts | 6 +--- src/api/project/projectRelevancy/index.ts | 4 +-- src/api/project/projectRelevancy/types.ts | 6 +--- src/api/project/projectTeam/index.ts | 4 +-- src/api/project/projectTeam/types.ts | 6 +--- src/api/project/projectTeamMember/index.ts | 4 +-- src/api/project/projectTeamMember/types.ts | 6 +--- src/types/global.d.ts | 16 ++-------- .../component/MachineryDetailTable.vue | 10 +++--- src/views/machinery/index.vue | 12 +++---- src/views/materials/company/index.vue | 12 +++---- .../component/MaterialsInventoryTable.vue | 12 +++---- src/views/materials/materials/index.vue | 18 ++++------- .../materials/materialsInventory/index.vue | 24 ++++---------- src/views/project/constructionUser/index.vue | 28 +++++++--------- src/views/project/contractor/index.vue | 14 ++++---- src/views/project/project/index.vue | 12 +++---- .../component/ShuttleFrame.vue | 12 +++---- src/views/project/projectRelevancy/index.vue | 32 ++++++------------- .../projectTeam/component/UserListDialog.vue | 30 ++++++++--------- src/views/project/projectTeam/index.vue | 15 ++++----- 36 files changed, 127 insertions(+), 235 deletions(-) diff --git a/src/api/machinery/machinery/index.ts b/src/api/machinery/machinery/index.ts index fad757b..27ecba7 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 { MachineryForm, MachineryQuery, MachineryVO, PageMachinery } from '@/api/machinery/machinery/types'; +import { MachineryForm, MachineryQuery, MachineryVO } from '@/api/machinery/machinery/types'; /** * 查询机械列表 @@ -8,7 +8,7 @@ import { MachineryForm, MachineryQuery, MachineryVO, PageMachinery } from '@/api * @returns {*} */ -export const listMachinery = (query?: MachineryQuery): AxiosPromise => { +export const listMachinery = (query?: MachineryQuery): AxiosPromise => { return request({ url: '/machinery/machinery/list', method: 'get', diff --git a/src/api/machinery/machinery/types.ts b/src/api/machinery/machinery/types.ts index 113b354..554d674 100644 --- a/src/api/machinery/machinery/types.ts +++ b/src/api/machinery/machinery/types.ts @@ -72,7 +72,7 @@ export interface MachineryForm extends BaseEntity { remark?: string; } -export interface MachineryQuery extends PageRequest { +export interface MachineryQuery extends PageQuery { /** * 机械名称 */ @@ -108,7 +108,3 @@ export interface MachineryQuery extends PageRequest { */ 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 9fbe588..809c367 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 { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO, PageMachineryDetail } from '@/api/machinery/machineryDetail/types'; +import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO } from '@/api/machinery/machineryDetail/types'; /** * 查询机械详情列表 @@ -8,7 +8,7 @@ import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO, PageMachi * @returns {*} */ -export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise => { +export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise => { return request({ url: '/machinery/machineryDetail/list', method: 'get', diff --git a/src/api/machinery/machineryDetail/types.ts b/src/api/machinery/machineryDetail/types.ts index 10608e8..097df22 100644 --- a/src/api/machinery/machineryDetail/types.ts +++ b/src/api/machinery/machineryDetail/types.ts @@ -109,7 +109,7 @@ export interface MachineryDetailForm extends BaseEntity { machineryId?: string | number; } -export interface MachineryDetailQuery extends PageRequest { +export interface MachineryDetailQuery extends PageQuery { /** * 检验证编号 */ @@ -155,7 +155,3 @@ 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 4737dbf..da21b9f 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 { CompanyForm, CompanyQuery, CompanyVO, PageCompany } from '@/api/materials/company/types'; +import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/types'; /** * 查询公司列表 @@ -8,7 +8,7 @@ import { CompanyForm, CompanyQuery, CompanyVO, PageCompany } from '@/api/materia * @returns {*} */ -export const listCompany = (query?: CompanyQuery): AxiosPromise => { +export const listCompany = (query?: CompanyQuery): AxiosPromise => { return request({ url: '/materials/company/list', method: 'get', diff --git a/src/api/materials/company/types.ts b/src/api/materials/company/types.ts index fe62e22..5c0a80f 100644 --- a/src/api/materials/company/types.ts +++ b/src/api/materials/company/types.ts @@ -62,7 +62,7 @@ export interface CompanyForm extends BaseEntity { qualification?: string; } -export interface CompanyQuery extends PageRequest { +export interface CompanyQuery extends PageQuery { /** * 公司名称 */ @@ -88,7 +88,3 @@ 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 09ff677..04a2153 100644 --- a/src/api/materials/materials/index.ts +++ b/src/api/materials/materials/index.ts @@ -1,13 +1,13 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { MaterialsForm, MaterialsQuery, MaterialsVO, PageMaterials } from '@/api/materials/materials/types'; +import { MaterialsForm, MaterialsQuery, MaterialsVO } 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', diff --git a/src/api/materials/materials/types.ts b/src/api/materials/materials/types.ts index 117af84..87c39a5 100644 --- a/src/api/materials/materials/types.ts +++ b/src/api/materials/materials/types.ts @@ -119,7 +119,7 @@ export interface MaterialsForm extends BaseEntity { status?: string; } -export interface MaterialsQuery extends PageRequest { +export interface MaterialsQuery extends PageQuery { /** * 材料名称 */ @@ -170,7 +170,3 @@ 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 18ae030..2d780e3 100644 --- a/src/api/materials/materialsInventory/index.ts +++ b/src/api/materials/materialsInventory/index.ts @@ -1,11 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { - MaterialsInventoryForm, - MaterialsInventoryQuery, - MaterialsInventoryVO, - PageMaterialsInventory -} from '@/api/materials/materialsInventory/types'; +import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types'; /** * 查询材料出/入库列表 @@ -13,7 +8,7 @@ import { * @returns {*} */ -export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise => { +export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise => { return request({ url: '/materials/materialsInventory/list', method: 'get', diff --git a/src/api/materials/materialsInventory/types.ts b/src/api/materials/materialsInventory/types.ts index 10c24cb..3a44d7f 100644 --- a/src/api/materials/materialsInventory/types.ts +++ b/src/api/materials/materialsInventory/types.ts @@ -139,7 +139,7 @@ export interface MaterialsInventoryForm extends BaseEntity { remark?: string; } -export interface MaterialsInventoryQuery extends PageRequest { +export interface MaterialsInventoryQuery extends PageQuery { /** * 材料id */ @@ -205,7 +205,3 @@ 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 4c1e4e1..d8a162a 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, PageConstructionUser } from '@/api/project/constructionUser/types'; +import { ConstructionUserForm, ConstructionUserQuery, ConstructionUserVO } from '@/api/project/constructionUser/types'; /** * 查询施工人员列表 @@ -8,7 +8,7 @@ import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery, PageCo * @returns {*} */ -export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise => { +export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise => { return request({ url: '/project/constructionUser/list', method: 'get', diff --git a/src/api/project/constructionUser/types.ts b/src/api/project/constructionUser/types.ts index dd3d794..aa53f0b 100644 --- a/src/api/project/constructionUser/types.ts +++ b/src/api/project/constructionUser/types.ts @@ -340,7 +340,7 @@ export interface ConstructionUserForm extends BaseEntity { remark?: string; } -export interface ConstructionUserQuery extends PageRequest { +export interface ConstructionUserQuery extends PageQuery { /** * 微信id */ @@ -476,7 +476,3 @@ 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 144f966..df3941e 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 { ContractorForm, ContractorQuery, ContractorVO, PageContractor } from '@/api/project/contractor/types'; +import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types'; /** * 查询分包单位列表 @@ -8,7 +8,7 @@ import { ContractorForm, ContractorQuery, ContractorVO, PageContractor } from '@ * @returns {*} */ -export const listContractor = (query?: ContractorQuery): AxiosPromise => { +export const listContractor = (query?: ContractorQuery): AxiosPromise => { return request({ url: '/project/contractor/list', method: 'get', diff --git a/src/api/project/contractor/types.ts b/src/api/project/contractor/types.ts index 9b695f4..bbb7c74 100644 --- a/src/api/project/contractor/types.ts +++ b/src/api/project/contractor/types.ts @@ -82,7 +82,7 @@ export interface ContractorForm extends BaseEntity { remark?: string; } -export interface ContractorQuery extends PageRequest { +export interface ContractorQuery extends PageQuery { /** * 公司名称 */ @@ -113,7 +113,3 @@ 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 16b87f7..0e56609 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 { PageProjectVo, ProjectForm, ProjectQuery, ProjectVO } from '@/api/project/project/types'; +import { ProjectForm, ProjectQuery, ProjectVO } from '@/api/project/project/types'; /** * 查询项目列表 @@ -8,7 +8,7 @@ import { PageProjectVo, ProjectForm, ProjectQuery, ProjectVO } from '@/api/proje * @returns {*} */ -export const listProject = (query?: ProjectQuery): AxiosPromise => { +export const listProject = (query?: ProjectQuery): AxiosPromise => { return request({ url: '/project/project/list', method: 'get', diff --git a/src/api/project/project/types.ts b/src/api/project/project/types.ts index 317944a..53c8a8a 100644 --- a/src/api/project/project/types.ts +++ b/src/api/project/project/types.ts @@ -222,7 +222,7 @@ export interface ProjectForm extends BaseEntity { isDelete?: number; } -export interface ProjectQuery extends PageRequest { +export interface ProjectQuery extends PageQuery { /** * 项目名称 */ @@ -328,7 +328,3 @@ 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 94cf59f..7577e83 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 { PageProjectRelevancy, ProjectRelevancyForm, ProjectRelevancyQuery, ProjectRelevancyVO } from '@/api/project/projectRelevancy/types'; +import { ProjectRelevancyForm, ProjectRelevancyQuery, ProjectRelevancyVO } from '@/api/project/projectRelevancy/types'; /** * 查询系统用户与项目关联列表 @@ -8,7 +8,7 @@ import { PageProjectRelevancy, ProjectRelevancyForm, ProjectRelevancyQuery, Proj * @returns {*} */ -export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromise => { +export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromise => { return request({ url: '/project/projectRelevancy/login/page', method: 'get', diff --git a/src/api/project/projectRelevancy/types.ts b/src/api/project/projectRelevancy/types.ts index 3b469e7..ff4190a 100644 --- a/src/api/project/projectRelevancy/types.ts +++ b/src/api/project/projectRelevancy/types.ts @@ -44,7 +44,7 @@ export interface ProjectRelevancyForm extends BaseEntity { deletedAt?: string; } -export interface ProjectRelevancyQuery extends PageRequest { +export interface ProjectRelevancyQuery extends PageQuery { /** * 用户ID */ @@ -65,7 +65,3 @@ export interface ProjectRelevancyQuery extends PageRequest { */ 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 cb504b5..d0d8284 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 { PageProjectTeam, ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types'; +import { ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types'; /** * 查询项目班组列表 @@ -8,7 +8,7 @@ import { PageProjectTeam, ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } fro * @returns {*} */ -export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise => { +export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise => { return request({ url: '/project/projectTeam/list', method: 'get', diff --git a/src/api/project/projectTeam/types.ts b/src/api/project/projectTeam/types.ts index 45a6469..abc84da 100644 --- a/src/api/project/projectTeam/types.ts +++ b/src/api/project/projectTeam/types.ts @@ -52,7 +52,7 @@ export interface ProjectTeamForm extends BaseEntity { remark?: string; } -export interface ProjectTeamQuery extends PageRequest { +export interface ProjectTeamQuery extends PageQuery { /** * 项目id */ @@ -73,7 +73,3 @@ 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 2d5f125..c64cee2 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 { PageProjectTeamMember, ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types'; +import { ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types'; /** * 查询项目班组下的成员列表 @@ -8,7 +8,7 @@ import { PageProjectTeamMember, ProjectTeamMemberForm, ProjectTeamMemberQuery, P * @returns {*} */ -export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise => { +export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise => { return request({ url: '/project/projectTeamMember/list', method: 'get', diff --git a/src/api/project/projectTeamMember/types.ts b/src/api/project/projectTeamMember/types.ts index 18e2d6f..1ed133c 100644 --- a/src/api/project/projectTeamMember/types.ts +++ b/src/api/project/projectTeamMember/types.ts @@ -62,7 +62,7 @@ export interface ProjectTeamMemberForm extends BaseEntity { remark?: string; } -export interface ProjectTeamMemberQuery extends PageRequest { +export interface ProjectTeamMemberQuery extends PageQuery { /** * 班组id */ @@ -93,7 +93,3 @@ export interface ProjectTeamMemberQuery extends PageRequest { */ params?: any; } - -export interface PageProjectTeamMember extends PageResponse { - records?: ProjectTeamMemberVO[]; -} diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 6eba9eb..83a0db7 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -89,20 +89,8 @@ declare global { declare interface PageQuery { pageNum: number; pageSize: number; - } - - declare interface PageRequest { - current: number; - pageSize: number; - sortField: string; - sortOrder: string; - } - - declare interface PageResponse { - total?: number; - size?: number; - current?: number; - pages?: number; + orderByColumn?: string; + isAsc?: string; } declare interface LayoutSetting { diff --git a/src/views/machinery/component/MachineryDetailTable.vue b/src/views/machinery/component/MachineryDetailTable.vue index 3cabb2a..6172cc1 100644 --- a/src/views/machinery/component/MachineryDetailTable.vue +++ b/src/views/machinery/component/MachineryDetailTable.vue @@ -35,7 +35,7 @@ size="small" v-show="total > 0" :total="total" - v-model:page="queryParams.current" + v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> @@ -120,10 +120,8 @@ const initFormData: MachineryDetailForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - current: 1, + pageNum: 1, pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend', checkoutNumber: undefined, checkoutUnit: undefined, checkoutDate: undefined, @@ -148,8 +146,8 @@ const machineryDetailList = ref([]); const getList = async () => { loading.value = true; const res = await listMachineryDetail(queryParams.value); - machineryDetailList.value = res.data.records; - total.value = res.data.total; + machineryDetailList.value = res.rows; + total.value = res.total; loading.value = false; }; diff --git a/src/views/machinery/index.vue b/src/views/machinery/index.vue index 15eccb3..c8c47e6 100644 --- a/src/views/machinery/index.vue +++ b/src/views/machinery/index.vue @@ -68,7 +68,7 @@ - + @@ -143,10 +143,8 @@ const initFormData: MachineryForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - current: 1, + pageNum: 1, pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend', machineryName: undefined, machineryNumber: undefined, projectId: currentProject.value.id, @@ -165,8 +163,8 @@ const { queryParams, form, rules } = toRefs(data); const getList = async () => { loading.value = true; const res = await listMachinery(queryParams.value); - machineryList.value = res.data.records; - total.value = res.data.total; + machineryList.value = res.rows; + total.value = res.total; loading.value = false; }; @@ -184,7 +182,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.current = 1; + queryParams.value.pageNum = 1; getList(); }; diff --git a/src/views/materials/company/index.vue b/src/views/materials/company/index.vue index 2f6796c..75833ef 100644 --- a/src/views/materials/company/index.vue +++ b/src/views/materials/company/index.vue @@ -66,7 +66,7 @@ - + @@ -133,10 +133,8 @@ const initFormData: CompanyForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - current: 1, + pageNum: 1, pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend', companyName: undefined, projectId: currentProject.value.id, status: undefined, @@ -154,8 +152,8 @@ const { queryParams, form, rules } = toRefs(data); const getList = async () => { loading.value = true; const res = await listCompany(queryParams.value); - companyList.value = res.data.records; - total.value = res.data.total; + companyList.value = res.rows; + total.value = res.total; loading.value = false; }; @@ -173,7 +171,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.current = 1; + queryParams.value.pageNum = 1; getList(); }; diff --git a/src/views/materials/materials/component/MaterialsInventoryTable.vue b/src/views/materials/materials/component/MaterialsInventoryTable.vue index b6115a7..9bd27fc 100644 --- a/src/views/materials/materials/component/MaterialsInventoryTable.vue +++ b/src/views/materials/materials/component/MaterialsInventoryTable.vue @@ -28,7 +28,7 @@ v-show="total > 0" :total="total" size="small" - v-model:page="materialsSearchParams.current" + v-model:page="materialsSearchParams.pageNum" v-model:limit="materialsSearchParams.pageSize" @pagination="getList" /> @@ -54,10 +54,8 @@ const loading = ref(true); const materialsSearchParams = reactive({ materialsId: props.materialsId, projectId: props.projectId, - current: 1, - pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend' + pageNum: 1, + pageSize: 10 }); const total = ref(0); @@ -66,8 +64,8 @@ const materialsInventoryList = ref([]); const getList = async () => { loading.value = true; const res = await listMaterialsInventory({ ...materialsSearchParams }); - materialsInventoryList.value = res.data.records; - total.value = res.data.total; + materialsInventoryList.value = res.rows; + total.value = res.total; loading.value = false; }; diff --git a/src/views/materials/materials/index.vue b/src/views/materials/materials/index.vue index 95bf803..d4abb6b 100644 --- a/src/views/materials/materials/index.vue +++ b/src/views/materials/materials/index.vue @@ -77,7 +77,7 @@ - + @@ -181,10 +181,8 @@ const initFormData: MaterialsForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - current: 1, + pageNum: 1, pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend', materialsName: undefined, companyId: undefined, projectId: currentProject.value.id, @@ -208,8 +206,8 @@ const companyOptions = ref([]); const getList = async () => { loading.value = true; const res = await listMaterials(queryParams.value); - materialsList.value = res.data.records; - total.value = res.data.total; + materialsList.value = res.rows; + total.value = res.total; loading.value = false; }; @@ -217,13 +215,11 @@ const getList = async () => { const getCompanyList = async () => { loading.value = true; const companyRes = await listCompany({ - current: 1, + pageNum: 1, pageSize: 1000, - sortField: 'createTime', - sortOrder: 'descend', projectId: currentProject.value.id }); - companyOptions.value = companyRes.data.records.map((company: CompanyVO) => ({ + companyOptions.value = companyRes.rows.map((company: CompanyVO) => ({ value: company.id, label: company.companyName })); @@ -244,7 +240,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.current = 1; + queryParams.value.pageNum = 1; getList(); }; diff --git a/src/views/materials/materialsInventory/index.vue b/src/views/materials/materialsInventory/index.vue index 56f1b12..6a81e90 100644 --- a/src/views/materials/materialsInventory/index.vue +++ b/src/views/materials/materialsInventory/index.vue @@ -92,14 +92,11 @@ - + - - - @@ -197,10 +194,8 @@ const initFormData: MaterialsInventoryForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - current: 1, + pageNum: 1, pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend', materialsId: undefined, projectId: currentProject.value.id, outPut: undefined, @@ -227,10 +222,10 @@ const materialsOptions = ref([]); const getList = async () => { loading.value = true; const res = await listMaterialsInventory(queryParams.value); - materialsInventoryList.value = res.data.records; - total.value = res.data.total; + materialsInventoryList.value = res.rows; + total.value = res.total; const materialsMap = new Map(); - res.data.records.forEach((record: MaterialsInventoryVO) => { + res.rows.forEach((record: MaterialsInventoryVO) => { const { id, materialsName } = record.materialsVo; if (!materialsMap.has(id)) { materialsMap.set(id, { id, materialsName }); @@ -254,7 +249,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.current = 1; + queryParams.value.pageNum = 1; getList(); }; @@ -271,13 +266,6 @@ const handleSelectionChange = (selection: MaterialsInventoryVO[]) => { multiple.value = !selection.length; }; -/** 新增按钮操作 */ -const handleAdd = () => { - reset(); - dialog.visible = true; - dialog.title = '添加材料出/入库'; -}; - /** 修改按钮操作 */ const handleUpdate = async (row?: MaterialsInventoryVO) => { reset(); diff --git a/src/views/project/constructionUser/index.vue b/src/views/project/constructionUser/index.vue index 883846a..8159aff 100644 --- a/src/views/project/constructionUser/index.vue +++ b/src/views/project/constructionUser/index.vue @@ -111,7 +111,7 @@ - + @@ -276,10 +276,8 @@ const initFormData: ConstructionUserForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - current: 1, + pageNum: 1, pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend', openid: undefined, nickName: undefined, userName: undefined, @@ -319,8 +317,8 @@ const { queryParams, form, rules } = toRefs(data); const getList = async () => { loading.value = true; const res = await listConstructionUser(queryParams.value); - constructionUserList.value = res.data.records; - total.value = res.data.total; + constructionUserList.value = res.rows; + total.value = res.total; loading.value = false; }; @@ -330,12 +328,10 @@ const contractorOpt = ref(); const getContractorList = async () => { loading.value = true; const res = await listContractor({ - current: 1, - pageSize: 20, - sortField: 'createTime', - sortOrder: 'descend' + pageNum: 1, + pageSize: 20 }); - contractorOpt.value = res.data.records.map((contractor: ContractorVO) => ({ + contractorOpt.value = res.rows.map((contractor: ContractorVO) => ({ value: contractor.id, label: contractor.name })); @@ -348,13 +344,13 @@ const projectTeamOpt = ref([]); const getProjectTeamList = async () => { loading.value = true; const res = await listProjectTeam({ - current: 1, + pageNum: 1, pageSize: 20, - sortField: 'createTime', - sortOrder: 'descend', + orderByColumn: 'createTime', + isAsc: 'desc', projectId: currentProject.value.id }); - projectTeamOpt.value = res.data.records.map((projectTeam: ProjectTeamVO) => ({ + projectTeamOpt.value = res.rows.map((projectTeam: ProjectTeamVO) => ({ value: projectTeam.id, label: projectTeam.teamName })); @@ -380,7 +376,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.current = 1; + queryParams.value.pageNum = 1; getList(); }; diff --git a/src/views/project/contractor/index.vue b/src/views/project/contractor/index.vue index d872c2f..d6af575 100644 --- a/src/views/project/contractor/index.vue +++ b/src/views/project/contractor/index.vue @@ -61,7 +61,7 @@ - + @@ -135,10 +135,10 @@ const initFormData: ContractorForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - current: 1, + pageNum: 1, pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend', + orderByColumn: 'createTime', + isAsc: 'desc', name: undefined, principal: undefined, principalPhone: undefined, @@ -157,8 +157,8 @@ const { queryParams, form, rules } = toRefs(data); const getList = async () => { loading.value = true; const res = await listContractor(queryParams.value); - contractorList.value = res.data.records; - total.value = res.data.total; + contractorList.value = res.rows; + total.value = res.total; loading.value = false; }; @@ -176,7 +176,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.current = 1; + queryParams.value.pageNum = 1; getList(); }; diff --git a/src/views/project/project/index.vue b/src/views/project/project/index.vue index 8199b19..46d5c99 100644 --- a/src/views/project/project/index.vue +++ b/src/views/project/project/index.vue @@ -78,7 +78,7 @@ - + @@ -180,10 +180,8 @@ const initFormData: ProjectForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - current: 1, + pageNum: 1, pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend', projectName: undefined, shortName: undefined, pId: undefined, @@ -220,8 +218,8 @@ const { queryParams, form, rules } = toRefs(data); const getList = async () => { loading.value = true; const res = await listProject(queryParams.value); - projectList.value = res.data.records; - total.value = res.data.total; + projectList.value = res.rows; + total.value = res.total; loading.value = false; }; /** 取消按钮 */ @@ -237,7 +235,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.current = 1; + queryParams.value.pageNum = 1; getList(); }; diff --git a/src/views/project/projectRelevancy/component/ShuttleFrame.vue b/src/views/project/projectRelevancy/component/ShuttleFrame.vue index a083c7d..f7634c4 100644 --- a/src/views/project/projectRelevancy/component/ShuttleFrame.vue +++ b/src/views/project/projectRelevancy/component/ShuttleFrame.vue @@ -22,13 +22,13 @@ const props = defineProps<{ userId: number | string }>(); const allProjects = ref<{ key: number | string; label: string }[]>([]); // **已关联的项目 ID 列表** -const selectedProjects = ref([]); +const selectedProjects = ref<(number | string)[]>([]); // **获取所有项目列表** const getProjectList = async () => { try { const res = await listProject(); - allProjects.value = res.data.records.map((project) => ({ + allProjects.value = res.rows.map((project) => ({ key: project.id, label: project.projectName })); @@ -36,15 +36,11 @@ const getProjectList = async () => { console.error('获取项目列表失败:', error); } }; -const getUserProjects = async () => { +const getUserProjects = async (s: string = '') => { if (!props.userId) return; try { const res = await listUserProjects({ userId: props.userId }); - - // 修改这里，使用 res.records 而不是 res.rows - selectedProjects.value = Array.isArray(res.data.records) ? res.data.records.map((item: ProjectRelevancyVO) => item.projectId) : []; - - console.log('已加载用户关联项目:', selectedProjects.value); + selectedProjects.value = Array.isArray(res.rows) ? res.rows.map((item: ProjectRelevancyVO) => item.projectId) : [];s } catch (error) { console.error('获取用户关联的项目失败:', error); selectedProjects.value = []; // 请求失败时清空列表 diff --git a/src/views/project/projectRelevancy/index.vue b/src/views/project/projectRelevancy/index.vue index 88fef4e..af7b169 100644 --- a/src/views/project/projectRelevancy/index.vue +++ b/src/views/project/projectRelevancy/index.vue @@ -10,9 +10,6 @@ - - - 搜索 重置 @@ -55,11 +52,6 @@ - - + @@ -111,7 +111,6 @@ const ids = ref>([]); const single = ref(true); const multiple = ref(true); const total = ref(0); -const userListVisible = ref(); const currentRow = ref({ id: undefined, projectId: undefined, @@ -138,10 +137,10 @@ const initFormData: ProjectTeamForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - current: 1, + pageNum: 1, pageSize: 10, - sortField: 'createTime', - sortOrder: 'descend', + orderByColumn: 'createTime', + isAsc: 'desc', projectId: currentProject.value.id, teamName: undefined, isClockIn: undefined, @@ -159,8 +158,8 @@ const { queryParams, form, rules } = toRefs(data); const getList = async () => { loading.value = true; const res = await listProjectTeam(queryParams.value); - projectTeamList.value = res.data.records; - total.value = res.data.total; + projectTeamList.value = res.rows; + total.value = res.total; loading.value = false; }; @@ -178,7 +177,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.current = 1; + queryParams.value.pageNum = 1; getList(); };