Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf

src/api/consumable.js

@@ -0,0 +1,166 @@
+import request from "@/utils/request";
+
+/**
+ * 查询耗材类型
+ * @returns
+ */
+export function gettbConsType(params) {
+    return request({
+        url: '/api/tbConsType',
+        method: "get",
+        params
+    });
+}
+
+/**
+ * 新增耗材类型
+ * @returns
+ */
+export function posttbConsType(data) {
+    return request({
+        url: '/api/tbConsType',
+        method: "post",
+        data
+    });
+}
+/**
+ * 修改耗材类型
+ * @returns
+ */
+export function puttbConsType(data) {
+    return request({
+        url: '/api/tbConsType',
+        method: "put",
+        data
+    });
+}
+/**
+ * 查询耗材信息
+ * @returns
+ */
+export function gettbConsInfo(params) {
+    return request({
+        url: '/api/tbConsInfo',
+        method: "get",
+        params
+    });
+}
+/**
+ * 耗材入库
+ * @returns
+ */
+export function posttbConsInfostockIn(data) {
+    return request({
+        url: '/api/tbConsInfo/stockIn',
+        method: "post",
+        data
+    });
+}
+/**
+ * 修改单位耗材值耗材
+ * @returns
+ */
+export function postapitbConsInfo(data) {
+    return request({
+        url: '/api/tbConsInfo',
+        method: "post",
+        data
+    });
+}
+/**
+ * 新增耗材信息
+ * @returns
+ */
+export function posttbConsInfo(data) {
+    return request({
+        url: '/api/tbConsInfo',
+        method: "post",
+        data
+    });
+}
+
+/**
+ * 查询查询耗材规格信息
+ * @returns
+ */
+export function getviewConSku(params) {
+    return request({
+        url: '/api/viewConSku',
+        method: "get",
+        params
+    });
+}
+/**
+ * 查询查询商品规格
+ * @returns
+ */
+export function gettbProductSpec(params) {
+    return request({
+        url: '/api/viewProductSkuShop',
+        method: "get",
+        params
+    });
+}
+/**
+ * 新增商品规格耗材信息
+ * @returns
+ */
+export function posttbProskuCon(data) {
+    return request({
+        url: '/api/tbProskuCon',
+        method: "post",
+        data
+    });
+}
+/**
+ * 新增商品规格耗材信息-修改后
+ * @returns
+ */
+export function posttbProskuCons(data) {
+    return request({
+        url: '/api/tbProskuCon',
+        method: "post",
+        data
+    });
+}
+/**
+ * 修改商品规格耗材信息状态
+ * @returns
+ */
+export function puttbProskuCon(data) {
+    return request({
+        url: '/api/tbProskuCon',
+        method: "put",
+        data
+    });
+}
+// 编辑单位耗材值
+// export function puttbProskuCon(data) {
+//     return request({
+//         url: '/api/tbProskuCon',
+//         method: "put",
+//         data
+//     });
+// }
+/**
+ * 删除商品规格耗材信息状态
+ * @returns
+ */
+export function deletetbProskuCon(data) {
+    return request({
+        url: '/api/tbProskuCon',
+        method: "delete",
+        data
+    });
+}
+/**
+ * 查询耗材流水信息
+ * @returns
+ */
+export function gettbConsInfoFlow(params) {
+    return request({
+        url: '/api/tbConsInfoFlow',
+        method: "get",
+        params
+    });
+}

src/api/invoicing.js

@@ -11,7 +11,24 @@ export function tbProductGet(params) {
     params
   });
 }
-
+export function tbProductlist(params) {
+  return request({
+    url: "/api/tbProduct/list",
+    method: "get",
+    params
+  });
+}
+/**
+ * 商品分类列表
+ * @returns
+ */
+export function tbShopCategoryGet(params) {
+  return request({
+    url: `/api/tbShopCategory`,
+    method: "get",
+    params
+  });
+}
 /**
  * 进销存类型字典
  * @returns
@@ -59,7 +76,14 @@ export function tbShopPurveyorGet(params) {
     params
   });
 }
-
+// 供应商列表1
+export function tbShopPurveyorGets(params) {
+  return request({
+    url: `/api/tbShopPurveyorTransact`,
+    method: "get",
+    params
+  });
+}
 /**
  * 增加供应商
  * @returns
@@ -95,7 +119,14 @@ export function tbShopPurveyorTransactInfo(data) {
     data
   });
 }
-
+// 付款
+export function paidAmount(data) {
+  return request({
+    url: `/api/tbShopPurveyorTransact/payTransact`,
+    method: "post",
+    data
+  });
+}
 /**
  * 进货账目汇总（单一供应商）
  * @returns
@@ -149,19 +180,26 @@ export function tbProductStockOperateOutAndOn(data) {
  */
 export function stock(params) {
   return request({
-    url: `/api/stock`,
+    url: `/api/stock/v2`,
+    method: "get",
+    params
+  });
+}
+// 库存列表子集列表
+export function stocks(params) {
+  return request({
+    url: `/api/stock/sku`,
     method: "get",
     params
   });
 }
-
 /**
  * 导出数据
  * @returns
  */
 export function stockdownload(data) {
   return request({
-    url: "/api/stock/download",
+    url: "/api/stock/download/v2",
     method: "post",
     data: {
       shopId: localStorage.getItem("shopId"),
@@ -180,7 +218,7 @@ export function stockdoImport(file) {
   formData.append("file", file);
   formData.append("shopId", localStorage.getItem("shopId"));
   return request({
-    url: "/api/stock/doImport",
+    url: "/api/stock/doImport/v2",
     method: "post",
     data: formData,
     Headers: {
@@ -203,3 +241,122 @@ export function stockStateChange(params) {
     }
   });
 }
+// 警戒设置
+export function stockStatewarnLine(params) {
+  return request({
+    url: `/api/stock/warnLine`,
+    method: "put",
+    data: {
+      ...params
+    }
+  });
+}
+// 共享库存
+export function stockStateChanges(params) {
+  return request({
+    url: `/api/stock/productStatus`,
+    method: "put",
+    data: {
+      shopId: localStorage.getItem("shopId"),
+      ...params
+    }
+  });
+}
+
+/**
+ * 新增盘点
+ * @returns
+ */
+export function tbProductStocktakin(data) {
+  return request({
+    url: `/api/tbProductStocktakin`,
+    method: "post",
+    data: {
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+
+/**
+ * 盘点记录查询
+ * @returns
+ */
+export function tbProductStocktakinGet(data) {
+  return request({
+    url: `/api/tbProductStocktakin`,
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+// 账单付款记录
+export function tbShopPurveyorTransacttransactPayInfos(params) {
+  return request({
+    url: `/api/tbShopPurveyorTransact/transactPayInfos`,
+    method: "get",
+    params
+  });
+}
+
+/**
+ * 查询耗材信息
+ * @returns
+ */
+export function tbConsInfoGet(data) {
+  return request({
+    url: `/api/tbConsInfo`,
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+
+/**
+ * 耗材出入库
+ * @returns
+ */
+export function stockInOut(data) {
+  return request({
+    url: `/api/tbConsInfo/stockInOut`,
+    method: "post",
+    data: {
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+
+/**
+ * 新增盘点耗材
+ * @returns
+ */
+export function tbConCheck(data) {
+  return request({
+    url: `/api/tbConCheck`,
+    method: "post",
+    data: {
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+
+/**
+ * 查询盘点耗材
+ * @returns
+ */
+export function tbConCheckGet(data) {
+  return request({
+    url: `/api/tbConCheck`,
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}