补卡记录,请假记录,施工人员列表日历

src/api/project/attendance/types.ts

@@ -54,7 +54,15 @@ export interface AttendanceMonthVO {
   id: string | number;
   clockDate: string;
   status: string;
-  attendanceList: monthList[];
+  attendanceList?: monthList[];
+  clockList?: clockObject;
+}
+
+interface clockObject {
+  downClockTime?: string;
+  downClockPic?: string;
+  upClockTime?: string;
+  upClockPic?: string;
 }
 
 interface monthList {

src/api/project/constructionUser/index.ts

@@ -10,8 +10,24 @@ import {
   ConstructionUserSalaryForm,
   ConstructionUserExitForm,
   ConstructionUserTemplateForm,
-  ConstructionUserMembeForm
+  ConstructionUserMembeForm,
+  ConstructionMonthQuery
 } from '@/api/project/constructionUser/types';
+import { AttendanceMonthVO } from '../attendance/types';
+
+/**
+ * 查询施工人员月份考勤列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosPromise<AttendanceMonthVO[]> => {
+  return request({
+    url: '/project/constructionUser/list/attendance/month',
+    method: 'get',
+    params: query
+  });
+};
 
 /**
  * 查询施工人员列表

src/api/project/constructionUser/types.ts

@@ -197,6 +197,19 @@ export interface skipType {
   id: string | number;
 }
 
+export interface ConstructionMonthQuery {
+  /**
+   * id
+   */
+  userId: string | number;
+
+  /**
+   * 打卡月份
+
+    */
+  clockMonth?: string | number;
+}
+
 export interface ConstructionUserMembeForm {
   /**
    * 用户id

src/api/project/workerDailyReport/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { WorkerDailyReportVO, WorkerDailyReportForm, WorkerDailyReportQuery } from '@/api/project/workerDailyReport/types';
+
+/**
+ * 查询施工人员日报列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listWorkerDailyReport = (query?: WorkerDailyReportQuery): AxiosPromise<WorkerDailyReportVO[]> => {
+  return request({
+    url: '/project/workerDailyReport/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询施工人员日报详细
+ * @param id
+ */
+export const getWorkerDailyReport = (id: string | number): AxiosPromise<WorkerDailyReportVO> => {
+  return request({
+    url: '/project/workerDailyReport/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增施工人员日报
+ * @param data
+ */
+export const addWorkerDailyReport = (data: WorkerDailyReportForm) => {
+  return request({
+    url: '/project/workerDailyReport',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改施工人员日报
+ * @param data
+ */
+export const updateWorkerDailyReport = (data: WorkerDailyReportForm) => {
+  return request({
+    url: '/project/workerDailyReport',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除施工人员日报
+ * @param id
+ */
+export const delWorkerDailyReport = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/project/workerDailyReport/' + id,
+    method: 'delete'
+  });
+};

src/api/project/workerDailyReport/types.ts

@@ -0,0 +1,111 @@
+export interface WorkerDailyReportVO {
+  /**
+   * 申请人名字
+   */
+  userName: string;
+
+  /**
+   * 今日完成工作
+   */
+  todayCompletedWork: string;
+
+  /**
+   * 未完成工作
+   */
+  unfinishedWork: string;
+
+  /**
+   * 明日工作
+   */
+  tomorrowWork: string;
+
+  /**
+   * 需协调与帮助
+   */
+  coordinationHelp: string;
+
+}
+
+export interface WorkerDailyReportForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 班组id
+   */
+  teamId?: string | number;
+
+  /**
+   * 申请人id
+   */
+  userId?: string | number;
+
+  /**
+   * 申请人名字
+   */
+  userName?: string;
+
+  /**
+   * 今日完成工作
+   */
+  todayCompletedWork?: string;
+
+  /**
+   * 未完成工作
+   */
+  unfinishedWork?: string;
+
+  /**
+   * 明日工作
+   */
+  tomorrowWork?: string;
+
+  /**
+   * 需协调与帮助
+   */
+  coordinationHelp?: string;
+
+  /**
+   * 附件
+   */
+  file?: string;
+
+}
+
+export interface WorkerDailyReportQuery extends PageQuery {
+
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 班组id
+   */
+  teamId?: string | number;
+
+  /**
+   * 申请人id
+   */
+  userId?: string | number;
+
+  /**
+   * 申请人名字
+   */
+  userName?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+