修改各模块ts接口规范

plus-ui/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 () => {

plus-ui/src/views/project/contractor/index.vue

@@ -143,6 +143,8 @@ const data = reactive<PageData<ContractorForm, ContractorQuery>>({
   queryParams: {
     current: 1,
     pageSize: 10,
+    sortField: 'createTime',
+    sortOrder: 'descend',
     name: undefined,
     principal: undefined,
     principalPhone: undefined,

plus-ui/src/views/project/projectRelevancy/component/ShuttleFrame.vue

@@ -10,15 +10,16 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, defineProps, watch } from 'vue';
+import { defineProps, onMounted, ref, watch } from 'vue';
 import { listProject } from '@/api/project/project';
-import { listUserProjects, addNewProjectRelevancy, removeNewProjectRelevancy } from '@/api/project/projectRelevancy';
+import { addNewProjectRelevancy, listUserProjects, removeNewProjectRelevancy } from '@/api/project/projectRelevancy';
+import { ProjectRelevancyVO } from '@/api/project/projectRelevancy/types';
 
 // **从父组件接收 `userId`**
-const props = defineProps<{ userId: number }>();
+const props = defineProps<{ userId: number | string }>();
 
 // **所有项目列表**
-const allProjects = ref<{ key: number; label: string }[]>([]);
+const allProjects = ref<{ key: number | string; label: string }[]>([]);
 
 // **已关联的项目 ID 列表**
 const selectedProjects = ref<number[]>([]);
@@ -41,9 +42,7 @@ const getUserProjects = async () => {
     const res = await listUserProjects({ userId: props.userId });
 
     // 修改这里，使用 res.records 而不是 res.rows
-    selectedProjects.value = Array.isArray(res.data.records)
-      ? res.data.records.map((item) => item.projectId)
-      : [];
+    selectedProjects.value = Array.isArray(res.data.records) ? res.data.records.map((item: ProjectRelevancyVO) => item.projectId) : [];
 
     console.log('已加载用户关联项目:', selectedProjects.value);
   } catch (error) {
@@ -64,7 +63,7 @@ watch(
 );
 
 // **处理穿梭框变更**
-const handleTransferChange = async (newValue: number[], direction: 'left' | 'right', movedKeys: number[]) => {
+const handleTransferChange = async (_: number[], direction: 'left' | 'right', movedKeys: number[]) => {
   try {
     if (direction === 'right') {
       // **添加关联**

plus-ui/src/views/project/projectRelevancy/index.vue

@@ -26,20 +26,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:projectRelevancy:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:projectRelevancy:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:projectRelevancy:edit']"
-              >修改</el-button
-            >
+              >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:projectRelevancy:remove']"
-              >删除</el-button
-            >
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:projectRelevancy:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:projectRelevancy:export']">导出 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -82,7 +82,7 @@
         <shuttle-frame :userId="selectedUserId" @close="shuttleVisible = false" />
       </el-dialog>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
     <!-- 添加或修改系统用户与项目关联对话框 -->
@@ -124,11 +124,13 @@
 </template>
 
 <script setup name="ProjectRelevancy" lang="ts">
-import { listProjectRelevancy, delProjectRelevancy, addProjectRelevancy, updateProjectRelevancy } from '@/api/project/projectRelevancy';
+import { addProjectRelevancy, delProjectRelevancy, listProjectRelevancy, updateProjectRelevancy } from '@/api/project/projectRelevancy';
 import { listProject } from '@/api/project/project';
 import { listUser } from '@/api/system/user';
-import { ProjectRelevancyVO, ProjectRelevancyQuery, ProjectRelevancyForm } from '@/api/project/projectRelevancy/types';
+import { ProjectRelevancyForm, ProjectRelevancyQuery, ProjectRelevancyVO } from '@/api/project/projectRelevancy/types';
 import ShuttleFrame from './component/ShuttleFrame.vue';
+import { UserVO } from '@/api/system/user/types';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const projectRelevancyList = ref<ProjectRelevancyVO[]>([]);
@@ -157,8 +159,10 @@ const initFormData: ProjectRelevancyForm = {
 const data = reactive<PageData<ProjectRelevancyForm, ProjectRelevancyQuery>>({
   form: { ...initFormData },
   queryParams: {
-    pageNum: 1,
+    current: 1,
     pageSize: 10,
+    sortField: 'createTime',
+    sortOrder: 'descend',
     userId: undefined,
     projectId: undefined,
     deletedAt: undefined,
@@ -196,7 +200,7 @@ const reset = () => {
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.value.pageNum = 1;
+  queryParams.value.current = 1;
   getList();
 };
 
@@ -221,7 +225,7 @@ const handleAdd = () => {
 };
 
 const shuttleVisible = ref(false);
-const selectedUserId = ref<number>();
+const selectedUserId = ref<string | number>();
 
 const handleUpdate = (row?: ProjectRelevancyVO) => {
   const currentRow = row || projectRelevancyList.value.find((item) => item.id === ids.value[0]);
@@ -276,7 +280,7 @@ const selectedProject = ref<any | null>(null);
 const getProjectList = async () => {
   try {
     const res = await listProject();
-    const projectListData = res.records;
+    const projectListData = res.data.records;
     projectList.value = projectListData;
 
     // 将项目详情存入 Map
@@ -301,11 +305,14 @@ const onProjectChange = (projectId: string) => {
 
 //获取新增用户列表方法
 
-const userList = ref<{ label: string; value: string }[]>([]);
+const userList = ref<{ userId: string | number; nickName: string }[]>([]);
 const getUserList = async () => {
   try {
-    const response = await listUser({});
-    userList.value = response.rows.map((user: any) => ({
+    const response = await listUser({
+      pageNum: 1,
+      pageSize: 100
+    });
+    userList.value = response.rows.map((user: UserVO) => ({
       userId: user.userId,
       nickName: user.nickName
     }));