add: 多门店代码合并

src/api/account/shop.ts

@@ -10,6 +10,19 @@ const ShopApi = {
       params: params,
     });
   },
+  getBranchList(params: PageQuery) {
+    return request<any, ShopInfoEditDTO[]>({
+      url: `${baseURL}/branchList`,
+      method: "get",
+      params: params,
+    });
+  },
+  getBranchChange(id: PageQuery) {
+    return request<any, ShopInfoEditDTO[]>({
+      url: `${baseURL}/change/${id}`,
+      method: "post",
+    });
+  },
   add(data: ShopInfoEditDTO) {
     return request<any, ShopInfoEditDTO>({
       url: `${baseURL}`,
@@ -277,4 +290,4 @@ export interface ShopInfo {
   tubeType?: number | null;
   updateTime?: null | string;
   [property: string]: any;
-}
+}

src/api/account/shopBranch.ts

@@ -0,0 +1,54 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/shop/branch";
+
+const ShopBranchApi = {
+  getList(params: any) {
+    return request<any>({
+      url: `${baseURL}/page`,
+      method: "get",
+      params
+    });
+  },
+  getDataSync(params: any) {
+    return request<any>({
+      url: `${baseURL}/get/dataSyncMethod`,
+      method: "get",
+      params
+    });
+  },
+  setDataSync(id: any) {
+    return request<any>({
+      url: `${baseURL}/setting/dataSyncMethod?dataSyncMethod=${id}`,
+      method: "post",
+    });
+  },
+  dataSync(id: any) {
+    return request<any>({
+      url: `${baseURL}/data/sync/enable?branchShopId=${id}`,
+      method: "post",
+    });
+  },
+  enable(id: any) {
+    return request<any>({
+      url: `${baseURL}/account/enable?branchShopId=${id}`,
+      method: "post",
+    });
+  },
+  disable(id: any) {
+    return request<any>({
+      url: `${baseURL}/account/disable?branchShopId=${id}`,
+      method: "post",
+    });
+  },
+};
+
+
+export interface Responseres {
+  code?: number | null;
+  data?: any;
+  msg?: null | string;
+  [property: string]: any;
+}
+
+export default ShopBranchApi;

src/api/notifications/index.ts

@@ -0,0 +1,58 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin";
+// 供应商
+const Api = {
+  /** 通知消息列表*/
+  getList(params: any) {
+    return request<any>({
+      url: `${baseURL}/syncNotice`,
+      method: "get",
+      params,
+    });
+  },
+  /** 全部*/
+  getAllList(params: any) {
+    return request<any>({
+      url: `${baseURL}/list`,
+      method: "get",
+      params,
+    });
+  },
+  get(id: string | number) {
+    return request<any>({
+      url: `${baseURL}/` + id,
+      method: "get",
+    });
+  },
+  add(data: any) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "post",
+      data,
+    });
+  },
+  edit(data: any) {
+    return request<any>({
+      url: `${baseURL}/syncNotice/read`,
+      method: "put",
+      data,
+    });
+  },
+
+  delete(id: string | number) {
+    return request<any>({
+      url: `${baseURL}/syncNotice?id=` + id,
+      method: "delete",
+    });
+  },
+  // 清空已读
+  syncNoticeclear() {
+    return request<any>({
+      url: `${baseURL}/syncNotice/clear`,
+      method: "delete",
+    });
+  },
+};
+
+export default Api;

src/api/product/index.ts

@@ -55,7 +55,7 @@ const AuthAPI = {
       method: "delete",
     });
   },
-  // 退款退回
+  // 同步
   refundToStock(data: any) {
     return request<any, Responseres>({
       url: `${baseURL}/refundToStock`,
@@ -63,6 +63,14 @@ const AuthAPI = {
       data,
     });
   },
+  // 退款退回
+  sync(data: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/sync`,
+      method: "post",
+      data,
+    });
+  },
 
   // 耗材列表
   productcons(params: any) {

src/api/product/libraryrecords.ts

@@ -0,0 +1,51 @@
+import request from "@/utils/request";
+import { Product_BaseUrl } from "@/api/config";
+const baseURL = Product_BaseUrl + "/admin/product";
+// 供应商
+const Api = {
+  /** 耗材库存变动记录*/
+  getList(params: any) {
+    return request<any>({
+      url: `${baseURL}/stock/flow`,
+      method: "get",
+      params,
+    });
+  },
+  /** 全部*/
+  getAllList(params: any) {
+    return request<any>({
+      url: `${baseURL}/list`,
+      method: "get",
+      params,
+    });
+  },
+  get(id: string | number) {
+    return request<any>({
+      url: `${baseURL}/` + id,
+      method: "get",
+    });
+  },
+  add(data: any) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "post",
+      data,
+    });
+  },
+  edit(data: any) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "put",
+      data,
+    });
+  },
+
+  delete(id: string | number) {
+    return request<any>({
+      url: `${baseURL}/` + id,
+      method: "delete",
+    });
+  },
+};
+
+export default Api;

src/api/product/stock.ts

@@ -8,7 +8,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/in`,
       method: "post",
-      data
+      data,
     });
   },
   //出库
@@ -16,7 +16,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/out`,
       method: "post",
-      data
+      data,
     });
   },
   // 库存盘点记录
@@ -24,7 +24,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/checkRecord`,
       method: "get",
-      params
+      params,
     });
   },
   //库存盘点
@@ -32,7 +32,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/check`,
       method: "post",
-      data
+      data,
     });
   },
   //耗材报损
@@ -41,7 +41,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/reportDamage`,
       method: "post",
-      data
+      data,
     });
   },
   //耗材库存变动记录
@@ -49,11 +49,17 @@ const Api = {
     return request<any>({
       url: `${baseURL}/flow`,
       method: "get",
-      params
+      params,
+    });
+  },
+  //耗材库存变动记录
+  reportinglosses(data: any) {
+    return request<any>({
+      url: `${baseURL}/reportDamage`,
+      method: "POST",
+      data,
     });
   },
 };
 
-
-
 export default Api;

src/api/supplier/index.ts

@@ -0,0 +1,60 @@
+import request from "@/utils/request";
+const baseURL = "/product/admin/product/vendor";
+
+// 供应商账单
+
+const AuthAPI = {
+  /** 供应商账单统计*/
+  getSummary(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/summary`,
+      method: "get",
+      params,
+    });
+  },
+  /** 分页*/
+  getPage(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill`,
+      method: "get",
+      params,
+    });
+  },
+  // 账单记录
+  getRecordList(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill/record`,
+      method: "get",
+      params,
+    });
+  },
+  // 账单付款记录
+  getPayRecordList(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill/pay/record`,
+      method: "get",
+      params,
+    });
+  },
+  // 账单付款
+  billPay(data: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill/pay`,
+      method: "post",
+      data,
+    });
+  },
+  
+};
+
+
+
+
+export interface Responseres {
+  code?: number | null;
+  data?: any;
+  msg?: null | string;
+  [property: string]: any;
+}
+
+export default AuthAPI;

src/api/system/user.ts

@@ -246,6 +246,7 @@ export interface UserInfo {
  * 用户分页查询对象
  */
 export interface UserPageQuery extends PageQuery {
+  times: any;
   /** 搜索关键字 */
   keywords?: string;