合并冲突

src/api/design/drawing/index.ts

@@ -61,3 +61,24 @@ export const delDrawing = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+/**
+ * 查阅
+ * @param id
+ */
+export const volumeFileViewer = (data) => {
+  return request({
+    url: '/design/volumeFileViewer',
+    method: 'post',
+    data
+  });
+};
+/**
+ * 查阅记录列表
+ * @param id
+ */
+export const volumeFileViewerList = (id) => {
+  return request({
+    url: '/design/volumeFileViewer/list?volumeFileId=' + id,
+    method: 'get'
+  });
+};

src/api/materials/overallPlanMaterialSupply/index.ts

@@ -0,0 +1,34 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+// 获取主数据列表
+export const obtainMasterDataList = (params: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/queryList',
+    method: 'get',
+    params
+  });
+};
+
+// 总供应计划列表
+export const totalsupplyplan = (params: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/list',
+    method: 'get',
+    params
+  });
+};
+// 总供应计划详细信息
+export const totalSupplyplanDetails = (id: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/' + id,
+    method: 'get',
+  });
+};
+// 修改物资-总供应计划
+export const materialChangeSupplyplan = (data: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan',
+    method: 'put',
+    data
+  });
+};

src/api/materials/purchaseDoc/index.ts

@@ -85,3 +85,13 @@ export const listLink = (data: any) => {
     params: data
   });
 };
+/**
+ * 通过采购单获取需求
+ * @param id
+ */
+export const purchaseDocPlanList = (id) => {
+  return request({
+    url: '/cailiaoshebei/purchaseDoc/planList/' + id,
+    method: 'get'
+  });
+};

src/api/materials/usageMaterials/index.ts

@@ -0,0 +1,41 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+// 查询物资-使用情况列表
+export const useMaterialsQueryList = (params: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply/list',
+    method: 'get',
+    params
+  });
+};
+
+// 新增物资
+export const newMaterialsAdd = (data: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply',
+    method: 'post',
+    data
+  });
+};
+// 修改物资
+export const materialsEdit = (data: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply',
+    method: 'put',
+    data
+  });
+};
+// 删除物资
+export const materialsDel = (id: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply/' + id,
+    method: 'delete',
+  });
+};
+// 获取物资详情
+export const queryMaterialsInfo = (id: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply/' + id,
+    method: 'get',
+  });
+};