完善项目模块页面和对应接口

src/views/project/constructionUser/index.vue

@@ -8,13 +8,19 @@
               <el-input v-model="queryParams.userName" placeholder="请输入人员姓名" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="分包公司" prop="contractorId">
-              <el-input v-model="queryParams.contractorId" placeholder="请输入分包公司" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.contractorId" clearable placeholder="请选择分包公司">
+                <el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="工种" prop="typeOfWork">
-              <el-input v-model="queryParams.typeOfWork" placeholder="请输入工种" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.typeOfWork" clearable placeholder="请选择工种">
+                <el-option v-for="item in type_of_work" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="打卡" prop="clock">
-              <el-input v-model="queryParams.clock" placeholder="请输入打卡" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.clock" clearable placeholder="请选择打卡">
+                <el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -59,12 +65,12 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="60" align="center" />
         <el-table-column label="姓名" align="center" prop="userName" />
-        <el-table-column label="分包公司" align="center">
+        <el-table-column label="分包公司" align="center" prop="contractorVo.name" />
+        <el-table-column label="班组" align="center" prop="teamId">
           <template #default="scope">
-            <div>{{ scope.row.ContractorVO.name }}</div>
+            {{ getTeamName(scope.row.teamId) }}
           </template>
         </el-table-column>
-        <el-table-column label="班组id" align="center" prop="teamId" />
         <el-table-column label="状态" align="center" prop="status" />
         <el-table-column label="联系电话" align="center" prop="phone" />
         <el-table-column label="性别" align="center" prop="sex">
@@ -90,23 +96,19 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:constructionUser:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['project:constructionUser:remove']"
-              ></el-button>
-            </el-tooltip>
+            <el-space wrap>
+              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:constructionUser:edit']">
+                修改
+              </el-button>
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:constructionUser:remove']">
+                删除
+              </el-button>
+            </el-space>
           </template>
         </el-table-column>
       </el-table>
 
-      <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>
     <!-- 添加或修改施工人员对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -123,17 +125,10 @@
         <el-form-item label="人员姓名" prop="userName">
           <el-input v-model="form.userName" placeholder="请输入人员姓名" />
         </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="分包公司id" prop="contractorId">
-          <el-input v-model="form.contractorId" placeholder="请输入分包公司id" />
-        </el-form-item>
-        <el-form-item label="班组id" prop="teamId">
-          <el-input v-model="form.teamId" placeholder="请输入班组id" />
-        </el-form-item>
-        <el-form-item label="是否代打" prop="isPinch">
-          <el-input v-model="form.isPinch" placeholder="请输入是否代打" />
+        <el-form-item label="分包公司" prop="contractorId">
+          <el-select v-model="form.contractorId" clearable placeholder="请选择分包公司">
+            <el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="联系电话" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入联系电话" />
@@ -145,16 +140,16 @@
           <el-input v-model="form.sfzNumber" placeholder="请输入身份证号码" />
         </el-form-item>
         <el-form-item label="身份证有效开始期" prop="sfzStart">
-          <el-input v-model="form.sfzStart" placeholder="请输入身份证有效开始期" />
+          <el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
         </el-form-item>
         <el-form-item label="身份证有效结束期" prop="sfzEnd">
-          <el-input v-model="form.sfzEnd" placeholder="请输入身份证有效结束期" />
+          <el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
         </el-form-item>
         <el-form-item label="身份证地址" prop="sfzSite">
           <el-input v-model="form.sfzSite" placeholder="请输入身份证地址" />
         </el-form-item>
         <el-form-item label="身份证出生日期" prop="sfzBirth">
-          <el-input v-model="form.sfzBirth" placeholder="请输入身份证出生日期" />
+          <el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
         </el-form-item>
         <el-form-item label="籍贯" prop="nativePlace">
           <el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
@@ -168,20 +163,15 @@
         <el-form-item label="持卡人" prop="yhkCardholder">
           <el-input v-model="form.yhkCardholder" placeholder="请输入持卡人" />
         </el-form-item>
-        <el-form-item label="工种(字典type_of_work)" prop="typeOfWork">
-          <el-input v-model="form.typeOfWork" placeholder="请输入工种(字典type_of_work)" />
+        <el-form-item label="工种" prop="typeOfWork">
+          <el-select v-model="form.typeOfWork" clearable placeholder="请选择工种">
+            <el-option v-for="item in type_of_work" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="打卡(0启用打卡 1禁止打卡)" prop="clock">
-          <el-input v-model="form.clock" placeholder="请输入打卡(0启用打卡 1禁止打卡)" />
-        </el-form-item>
-        <el-form-item label="入场时间" prop="entryDate">
-          <el-input v-model="form.entryDate" placeholder="请输入入场时间" />
-        </el-form-item>
-        <el-form-item label="离场时间" prop="leaveDate">
-          <el-input v-model="form.leaveDate" placeholder="请输入离场时间" />
-        </el-form-item>
-        <el-form-item label="薪水" prop="salary">
-          <el-input v-model="form.salary" placeholder="请输入薪水" />
+        <el-form-item label="打卡" prop="clock">
+          <el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
+            <el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -206,8 +196,11 @@ import {
   updateConstructionUser
 } from '@/api/project/constructionUser';
 import { ConstructionUserForm, ConstructionUserQuery, ConstructionUserVO } from '@/api/project/constructionUser/types';
-
 import { useUserStoreHook } from '@/store/modules/user';
+import { listContractor } from '@/api/project/contractor';
+import { listProjectTeam } from '@/api/project/projectTeam';
+import { ContractorVO } from '@/api/project/contractor/types';
+import { ProjectTeamVO } from '@/api/project/projectTeam/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { type_of_work, user_sex_type, user_clock_type } = toRefs<any>(proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type'));
@@ -266,8 +259,10 @@ const initFormData: ConstructionUserForm = {
 const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
   form: { ...initFormData },
   queryParams: {
-    pageNum: 1,
+    current: 1,
     pageSize: 10,
+    sortField: 'createTime',
+    sortOrder: 'descend',
     openid: undefined,
     nickName: undefined,
     pacePhoto: undefined,
@@ -298,8 +293,7 @@ const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
   },
   rules: {
     id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
-    sex: [{ required: true, message: '0:保密 1:男 2女不能为空', trigger: 'change' }],
-    clock: [{ required: true, message: '打卡(0启用打卡 1禁止打卡)不能为空', trigger: 'blur' }]
+    clock: [{ required: true, message: '打卡不能为空', trigger: 'blur' }]
   }
 });
 
@@ -309,11 +303,53 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listConstructionUser(queryParams.value);
-  constructionUserList.value = res.rows;
-  total.value = res.total;
+  constructionUserList.value = res.data.records;
+  total.value = res.data.total;
   loading.value = false;
 };
 
+const contractorOpt = ref();
+
+/** 查询当前项目下的分包公司列表 */
+const getContractorList = async () => {
+  loading.value = true;
+  const res = await listContractor({
+    current: 1,
+    pageSize: 20,
+    sortField: 'createTime',
+    sortOrder: 'descend'
+  });
+  contractorOpt.value = res.data.records.map((contractor: ContractorVO) => ({
+    value: contractor.id,
+    label: contractor.name
+  }));
+  loading.value = false;
+};
+
+const projectTeamOpt = ref();
+
+/** 查询当前项目下的班组列表 */
+const getProjectTeamList = async () => {
+  loading.value = true;
+  const res = await listProjectTeam({
+    current: 1,
+    pageSize: 20,
+    sortField: 'createTime',
+    sortOrder: 'descend',
+    projectId: currentProject.value.id
+  });
+  projectTeamOpt.value = res.data.records.map((projectTeam: ProjectTeamVO) => ({
+    value: projectTeam.id,
+    label: projectTeam.teamName
+  }));
+  loading.value = false;
+};
+
+const getTeamName = (teamId: string | number) => {
+  const team = projectTeamOpt.value.find((item: any) => item.value === teamId);
+  return team ? team.label : teamId;
+};
+
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -328,7 +364,7 @@ const reset = () => {
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.value.pageNum = 1;
+  queryParams.value.current = 1;
   getList();
 };
 
@@ -401,5 +437,7 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
+  getContractorList();
+  getProjectTeamList();
 });
 </script>