From f0a88d3ad07f2b19d64585806724a6ad6286f73a Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 17 Oct 2024 09:05:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/yskApi/consumable.js | 20 ++++++++++----------
 http/yskApi/requestAll.js |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/http/yskApi/consumable.js b/http/yskApi/consumable.js
index 09c9c05..ac31a33 100644
--- a/http/yskApi/consumable.js
+++ b/http/yskApi/consumable.js
@@ -179,16 +179,16 @@ export function gettbConsInfoFlow(params) {
 /**
  * 分组查询获取耗材流水信息
  */
-export function viewConInfoFlow(data) {
-	return request({
-		url: "/api/viewConInfoFlow",
-		method: "get",
-		params: {
-			shopId: uni.getStorageSync("shopId"),
-			...data
-		}
-	});
-}
+// export function viewConInfoFlow(data) {
+// 	return request({
+// 		url: "/api/viewConInfoFlow",
+// 		method: "get",
+// 		params: {
+// 			shopId: uni.getStorageSync("shopId"),
+// 			...data
+// 		}
+// 	});
+// }
 
 /**
  *   查询耗材单位列表
diff --git a/http/yskApi/requestAll.js b/http/yskApi/requestAll.js
index f20b970..38d23ab 100644
--- a/http/yskApi/requestAll.js
+++ b/http/yskApi/requestAll.js
@@ -259,7 +259,7 @@ export function tbPlussShopStaff(data) {
 // 耗材列表
 export function viewConInfoFlowget(data) {
 	return request({
-		url: `/api/viewConInfoFlow/get`,
+		url: `/api/tbConsInfo/allAndPro`,
 		method: 'post',
 		data
 	});