进度计划添加计划,添加日报

src/api/progress/plan/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery } from '@/api/progress/plan/types';
+import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery, ProgressPlanForm, lastTimeVo, workScheduleListVO, workScheduleListQuery, progressPlanDetailForm } from '@/api/progress/plan/types';
 
 /**
  * 查询进度类别列表
@@ -74,8 +74,55 @@ export const getProjectSquare = (projectId: string) => {
   });
 };
 
-export const lastTime=()=>{}
-export const workScheduleAddPlan=()=>{}
-export const workScheduleList=()=>{}
+/**
+ * 获取进度类别最后一次进度信息
+ * @param id
+ */
+export const lastTime = (id: string | number ):AxiosPromise<lastTimeVo> => {
+  return request({
+    url: '/progress/progressCategory/lastTime/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增进度计划
+ * @param data
+ */
+export const workScheduleAddPlan = (data: ProgressPlanForm) => {
+  return request({
+    url: '/progress/progressPlan',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 获取进度计划详细信息
+ * @param data
+ */
+export const workScheduleList = (query: workScheduleListQuery):AxiosPromise<workScheduleListVO[]> => {
+  return request({
+    url: '/progress/progressPlan/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 新增进度计划详情（百分比设施）
+ * @param data
+ */
+export const workScheduleSubmit = (data: progressPlanDetailForm) => {
+  return request({
+    url: '/progress/progressPlanDetail/insert/percentage',
+    method: 'post',
+    data: data
+  });
+};
 export const workScheduleDel=()=>{}
-export const workScheduleSubmit=()=>{}
+      
+export const pvModuleList=()=>{}
+export const addDaily=()=>{}
+export const getDailyBook=()=>{}
+export const deleteDaily=()=>{}

src/api/progress/plan/types.ts

@@ -23,11 +23,11 @@ export interface ProgressCategoryVO {
    * 项目id（0表示共用）
    */
   projectId: string | number;
-
-    /**
-     * 子对象
-     */
-    children: ProgressCategoryVO[];
+  matrixId?: string | number;
+  /**
+   * 子对象
+   */
+  children: ProgressCategoryVO[];
 }
 
 export interface ProgressCategoryForm extends BaseEntity {
@@ -55,13 +55,57 @@ export interface ProgressCategoryForm extends BaseEntity {
    * 项目id（0表示共用）
    */
   projectId?: string | number;
-    matrixId?: string | number;
+  matrixId?: string | number;
+}
 
+export interface ProgressPlanForm {
+  projectId?: string | number;
+  matrixId?: string | number;
+  progressCategoryId?: string | number;
+  startDate?: string;
+  endDate?: string;
+  planNumber?: number;
+  detailList: {
+    date: string;
+    planNumber: number;
+  }[];
+}
 
+export interface workScheduleListVO {
+  id: string | number;
+  progressCategoryId: string | number;
+  progressCategoryName: string;
+  startDate: string;
+  endDate: string;
+  planNumber: number;
+  finishedNumber: number;
+  detailList: {
+    id: string | number;
+    date: string;
+    planNumber: number;
+    finishedNumber: number;
+    aiFill: boolean;
+  }[];
+}
+
+export interface progressPlanDetailForm {
+  id: string | number;
+  finishedNumber: number;
+  submitTime?: string;
+}
+
+export interface workScheduleListQuery {
+  progressCategoryId?: string | number;
+  pageSize?: number;
+  pageNum?: number;
+}
+
+export interface lastTimeVo {
+  endDate: string;
+  leftNum: number;
 }
 
 export interface ProgressCategoryQuery {
-
   /**
    * 父类别id
    */
@@ -82,15 +126,12 @@ export interface ProgressCategoryQuery {
    */
   projectId?: string | number;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
-     /**
- * 方阵id
-  */
-    matrixId?: string | number;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+  /**
+   * 方阵id
+   */
+  matrixId?: string | number;
 }
-
-
-