Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

src/api/consumable.js

@@ -163,27 +163,15 @@ export function deletetbProskuCon(data) {
  * 查询耗材流水信息
  * @returns
  */
-export function gettbConsInfoFlow(params) {
+export function gettbConsInfoFlow(data) {
   return request({
-    url: "/api/tbConsInfoFlow",
-    method: "get",
-    params
-  });
-}
-/**
- * 分组查询获取耗材流水信息
- */
-export function viewConInfoFlow(data) {
-  return request({
-    url: "/api/viewConInfoFlow",
-    method: "get",
-    params: {
-      shopId: localStorage.getItem("shopId"),
-      ...data
-    }
+    url: "/api/viewConInfoFlow/get",
+    method: "post",
+    data
   });
 }
 
+
 /**
  *   查询耗材单位列表
  */
@@ -236,3 +224,23 @@ export function tbProskuConV2(data) {
     data
   });
 }
+/**
+ * 耗材库存统计
+ */
+export function tbConsInfoFlowcount(data) {
+  return request({
+    url: "/api/tbConsInfoFlow/count",
+    method: "post",
+    data
+  });
+}
+/**
+ * 耗材库存记录列表
+ */
+export function tbConsInfoFlowstock(data) {
+  return request({
+    url: "/api/tbConsInfoFlow/stock",
+    method: "post",
+    data
+  });
+}

src/api/devices.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 /**
- * 增加打印机
+ 
  * @returns
  */
 export function tbPrintMachine(data, method = 'post') {
@@ -21,12 +21,34 @@ export function tbPrintMachine(data, method = 'post') {
  */
 export function tbPrintMachineGet(params) {
     return request({
-        url: '/api/tbPrintMachine',
+        url: '/api/shop-config/printer/list',
         method: 'get',
         params: {
-            shopId: localStorage.getItem('shopId'),
-            sort: '',
+
             ...params
         }
     })
-}
+}
+// 删除
+export function delTableHandle(id) {
+    return request({
+        url: '/api/shop-config/printer/' + id,
+        method: 'DELETE',
+    })
+}
+//  * 打印机详情
+export function printerd(id) {
+    return request({
+        url: '/api/shop-config/printer/' + id,
+        method: 'get',
+
+    })
+}
+// 编辑 新增打印机
+export function configprinter(data, method = "post") {
+    return request({
+        url: `/api/shop-config/printer`,
+        method: method,
+        data
+    });
+}

src/api/notifications.js

@@ -40,3 +40,12 @@ export function delmsg(ids) {
     data: ids
   })
 }
+
+//获取订阅二维码
+export function subQrCode(params) {
+  return request({
+    url: '/api/msg/subQrCode',
+    method: 'get',
+    params
+  })
+}