下载资料模板,导入员工资料,详情修正,入退场记录

src/api/project/constructionUser/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request, { download } from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import {
   ConstructionUserForm,
@@ -9,7 +9,8 @@ import {
   ConstructionUserPlayCardForm,
   ConstructionUserSalaryForm,
   ConstructionUserExitForm,
-  ConstructionUserTemplateForm
+  ConstructionUserTemplateForm,
+  ConstructionUserMembeForm
 } from '@/api/project/constructionUser/types';
 
 /**
@@ -159,9 +160,31 @@ export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
  * @param query
  */
 export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => {
+  let { projectId } = query;
+  const fileName = projectId + '_project.zip';
+  return download('/project/constructionUserFile/exportFileTemplate', query, fileName);
+};
+
+/**
+ * 施工人员退场
+ * @param data
+ */
+export const delConstructionUserMember = (data: ConstructionUserMembeForm) => {
   return request({
-    url: '/project/constructionUserFile/exportFileTemplate',
-    method: 'get',
-    params: query
+    url: '/project/projectTeamMember/',
+    method: 'delete',
+    data
+  });
+};
+
+/**
+ * 上传施工人员文件压缩包，批量导入存储施工人员文件
+ * @param data
+ */
+export const importConstructionUserInfo = (file: string) => {
+  return request({
+    url: '/project/constructionUserFile/upload/zip',
+    method: 'post',
+    data: { file }
   });
 };

src/api/project/constructionUser/types.ts

@@ -197,6 +197,25 @@ export interface skipType {
   id: string | number;
 }
 
+export interface ConstructionUserMembeForm {
+  /**
+   * 用户id
+   */
+  id: string | number;
+  /**
+   * 用户姓名
+   */
+  userName: string | number;
+  /**
+   * 文件路径
+   */
+  filePath: string;
+  /**
+   * 备注
+   */
+  remark: string | number;
+}
+
 export interface ConstructionUserTemplateForm {
   /**
    * 项目id
@@ -300,6 +319,10 @@ export interface ConstructionUserForm extends BaseEntity {
    * 分包公司id
    */
   contractorId?: string | number;
+  /**
+   * 结算方式
+   */
+  wageMeasureUnit?: string | number;
 
   /**
    * 班组id

src/api/project/constructionUserFile/types.ts

@@ -40,6 +40,10 @@ export interface ConstructionUserExitVO {
    * 用户id
    */
   userId: string | number;
+  /**
+   * 文件路径地址
+   */
+  pathUrl: Array<string>;
 
   /**
    * 身份证号码

src/api/project/projectTeamMember/types.ts

@@ -24,6 +24,11 @@ export interface ProjectTeamMemberVO {
    */
   postId: string | number;
 
+  /**
+   * 施工人员姓名
+   */
+  memberName: string;
+
   /**
    * 备注
    */