合并

src/api/cory/contactnotice/types.ts

@@ -8,6 +8,7 @@ export interface ContactnoticeVO {
    * 项目ID
    */
   projectId: string | number;
+  status: string;
 
   /**
    * 模板类型

src/api/materials/appointment/index.ts

@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 设计人员
+// 新增
+export const designUserAdd = (data) => {
+  return request({
+    url: '/cailiaoshebei/purchaseUser/addOrUpdate',
+    method: 'post',
+    data: data
+  });
+};
+
+// 查询
+export const designUserDetail = (projectId) => {
+  return request({
+    url: `/cailiaoshebei/purchaseUser/byProject/${projectId}`,
+    method: 'get'
+  });
+};
+
+// 查询
+export const systemUserList = (query) => {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+    params: query
+  });
+};

src/api/materials/batchPlan/index.ts

@@ -22,7 +22,7 @@ export const listCailiaoshebei = (query?: any): AxiosPromise<CailiaoshebeiVO[]>
  */
 export const getCailiaoshebei = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
   return request({
-    url: '/cailiaoshebei/cailiaoshebei/' + id,
+    url: '/cailiaoshebei/mrpBase/' + id,
     method: 'get'
   });
 };
@@ -45,8 +45,8 @@ export const addCailiaoshebei = (data: CailiaoshebeiForm) => {
  */
 export const updateCailiaoshebei = (data: CailiaoshebeiForm) => {
   return request({
-    url: '/cailiaoshebei/cailiaoshebei',
-    method: 'put',
+    url: '/cailiaoshebei/mrpBase/batch',
+    method: 'post',
     data: data
   });
 };
@@ -69,7 +69,7 @@ export const delCailiaoshebei = (id: string | number | Array<string | number>) =
  */
 export const listBatch = (query?: any): AxiosPromise => {
   return request({
-    url: '/cailiaoshebei/materialbatchdemandplan/pcList',
+    url: '/cailiaoshebei/mrpBase/list',
     method: 'get',
     params: query
   });
@@ -79,11 +79,11 @@ export const listBatch = (query?: any): AxiosPromise => {
  * 新增物资-材料设备批次
  * @param data
  */
-export const getBatch = (data: any) => {
+export const getBatch = (query: any) => {
   return request({
-    url: '/cailiaoshebei/materialbatchdemandplan/pcAdd',
-    method: 'post',
-    data: data
+    url: '/cailiaoshebei/materialbatchdemandplan/list',
+    method: 'get',
+    params: query
   });
 };
 
@@ -93,7 +93,7 @@ export const getBatch = (data: any) => {
  */
 export const delBatch = (ids: string | number | Array<string | number>) => {
   return request({
-    url: '/cailiaoshebei/materialbatchdemandplan/' + ids,
+    url: '/cailiaoshebei/mrpBase/' + ids,
     method: 'delete'
   });
 };