Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx

src/api/bidding/biddingLimit/index.ts

@@ -53,3 +53,18 @@ export const sheetList = (query) => {
     params: query
   });
 };
+//获取sheet
+export const obtainAllVersionNumbers = (query) => {
+  return request({
+    url: '/bidding/biddingLimitList/obtainAllVersionNumbers',
+    method: 'get',
+    params: query
+  });
+};
+//获取sheet
+export const getVersionDetail = (id) => {
+  return request({
+    url: '/bidding/biddingLimitList/getVersionDetail/' + id,
+    method: 'get'
+  });
+};

src/api/bidding/listOfWinningBids/index.ts

@@ -8,7 +8,7 @@ import { ListOfWinningBidsVO, ListOfWinningBidsForm, ListOfWinningBidsQuery } fr
  * @returns {*}
  */
 
-export const listListOfWinningBids = (query?: ListOfWinningBidsQuery): AxiosPromise<ListOfWinningBidsVO[]> => {
+export const listListOfWinningBids = (query) => {
   return request({
     url: '/bidding/listOfWinningBids/list',
     method: 'get',

src/api/ctr/expensesContract/index.ts

@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ExpensesContractVO, ExpensesContractForm, ExpensesContractQuery } from '@/api/ctr/expensesContract/types';
+
+/**
+ * 查询支出合同列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listExpensesContract = (query?: ExpensesContractQuery): AxiosPromise<ExpensesContractVO[]> => {
+  return request({
+    url: '/ctr/expensesContract/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询支出合同详细
+ * @param id
+ */
+export const getExpensesContract = (id: string | number): AxiosPromise<ExpensesContractVO> => {
+  return request({
+    url: '/ctr/expensesContract/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增支出合同
+ * @param data
+ */
+export const addExpensesContract = (data: ExpensesContractForm) => {
+  return request({
+    url: '/ctr/expensesContract',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改支出合同
+ * @param data
+ */
+export const updateExpensesContract = (data: ExpensesContractForm) => {
+  return request({
+    url: '/ctr/expensesContract',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除支出合同
+ * @param id
+ */
+export const delExpensesContract = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/ctr/expensesContract/' + id,
+    method: 'delete'
+  });
+};
+/**
+ * 查看支出合同附件列表
+ * @param id
+ */
+export const getFileList = (data) => {
+  return request({
+    url: '/ctr/expensesContract/file/list',
+    method: 'get',
+    params: data
+  })
+}
+
+// 获取招标计划
+export const getTenderPlan = (data) => {
+  return request({
+    url: '/ctr/expensesContract/tender/list',
+    method: 'get',
+    params: data
+  })
+}

src/api/ctr/expensesContract/types.ts

@@ -0,0 +1,141 @@
+export interface ExpensesContractVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode: string;
+
+  /**
+   * 合同类型
+   */
+  contractType: string;
+
+  /**
+   * 供应商
+   */
+  contractSupplier: string;
+
+  /**
+   * 分包内容
+   */
+  contractedContent: string;
+
+  /**
+   * 合同金额
+   */
+  amount: number;
+
+  /**
+   * 招标Id
+   */
+  tenderId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface ExpensesContractForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同类型
+   */
+  contractType?: string;
+
+  /**
+   * 供应商
+   */
+  contractSupplier?: string;
+
+  /**
+   * 分包内容
+   */
+  contractedContent?: string;
+
+  /**
+   * 合同金额
+   */
+  amount?: number;
+
+  /**
+   * 招标Id
+   */
+  tenderId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface ExpensesContractQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同类型
+   */
+  contractType?: string;
+
+  /**
+   * 供应商
+   */
+  contractSupplier?: string;
+
+  /**
+   * 分包内容
+   */
+  contractedContent?: string;
+
+  /**
+   * 合同金额
+   */
+  amount?: number;
+
+  /**
+   * 招标Id
+   */
+  tenderId?: string | number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/ctr/incomeContract/index.ts

@@ -0,0 +1,74 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { IncomeContractVO, IncomeContractForm, IncomeContractQuery } from '@/api/ctr/incomeContract/types';
+
+/**
+ * 查询收入合同列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listIncomeContract = (query?: IncomeContractQuery): AxiosPromise<IncomeContractVO[]> => {
+  return request({
+    url: '/ctr/incomeContract/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询收入合同详细
+ * @param id
+ */
+export const getIncomeContract = (id: string | number): AxiosPromise<IncomeContractVO> => {
+  return request({
+    url: '/ctr/incomeContract/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增收入合同
+ * @param data
+ */
+export const addIncomeContract = (data: IncomeContractForm) => {
+  return request({
+    url: '/ctr/incomeContract',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改收入合同
+ * @param data
+ */
+export const updateIncomeContract = (data: IncomeContractForm) => {
+  return request({
+    url: '/ctr/incomeContract',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除收入合同
+ * @param id
+ */
+export const delIncomeContract = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/ctr/incomeContract/' + id,
+    method: 'delete'
+  });
+};
+/**
+ * 查看收入合同附件列表
+ * @param id
+ */
+export const getFileList = (data) => {
+  return request({
+    url: '/ctr/incomeContract/file/list',
+    method: 'get',
+    params: data
+  })
+}

src/api/ctr/incomeContract/types.ts

@@ -0,0 +1,126 @@
+export interface IncomeContractVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode: string;
+
+  /**
+   * 合同类型
+   */
+  contractType: string;
+
+  /**
+   * 业主单位
+   */
+  contractOwner: string;
+
+  /**
+   * 承包内容
+   */
+  contractedContent: string;
+
+  /**
+   * 合同金额
+   */
+  amount: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface IncomeContractForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同类型
+   */
+  contractType?: string;
+
+  /**
+   * 业主单位
+   */
+  contractOwner?: string;
+
+  /**
+   * 承包内容
+   */
+  contractedContent?: string;
+
+  /**
+   * 合同金额
+   */
+  amount?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface IncomeContractQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同类型
+   */
+  contractType?: string;
+
+  /**
+   * 业主单位
+   */
+  contractOwner?: string;
+
+  /**
+   * 承包内容
+   */
+  contractedContent?: string;
+
+  /**
+   * 合同金额
+   */
+  amount?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/design/Professional/index.ts

@@ -31,3 +31,11 @@ export const getFileList = (id) => {
     method: 'get'
   });
 };
+// 获取专业
+export const extractUserMajor = (params) => {
+  return request({
+    url: '/design/extract/userMajor',
+    method: 'get',
+    params
+  });
+};

src/api/materials/materialsInventory/types.ts

@@ -82,7 +82,10 @@ export interface MaterialsInventoryForm extends BaseEntity {
    * 主键id
    */
   id?: string | number;
-
+  /**
+   * 使用部位
+   */
+  usePart?: string;
   /**
    * 材料id
    */

src/api/materials/purchaseDoc/index.ts

@@ -124,7 +124,7 @@ export const logisticsDetial = (id) => {
 
 export const getDetailBASE = (id) => {
   return request({
-    url: '/cailiaoshebei/purchaseDoc/pic/' + id,
+    url: '/cailiaoshebei/purchaseDoc/pdf/' + id,
     method: 'get'
   });
 };