代码更新

pageConsumables/index.vue

@@ -22,9 +22,8 @@
 
 	<view class="ConsumablesConent" v-if="datas.list.length">
 		<view v-for="(item,index) in datas.list" :key="index">
-			<view>
-				{{item.conName}}
-				<view> {{item.conTypeName}} </view>
+			<view> {{item.conName}}
+				<view> {{item.consGroupName}} </view>
 			</view>
 			<view>
 				<view>
@@ -37,7 +36,7 @@
 				</view>
 				<view>
 					<view style="color: #318AFE;">
-						{{item.stockNumber-item.stockConsume}}
+						{{item.stockNumber}}
 					</view>
 					<view>
 						剩余库存
@@ -110,6 +109,8 @@
 		tbConsType,
 		tbConsTypeList
 	} from '@/http/yskApi/requestAll.js';
+	import { getConsPage,getConsGrpupList } from '@/api/cons.js';
+	
 	let reportDamage = ref(null)
 	let refMoreSheet = ref(null)
 	let show = ref(false)
@@ -150,6 +151,36 @@
 		gettbConsTypeList()
 	})
 
+	/**
+	 * 获取耗材列表
+	 */
+	async function getList(d = "") {
+		getConsPage({
+			conName: datas.conName,
+			conTypeId: d,
+			size: 100,
+			page: 0
+		}).then(res => {
+			datas.list = res.records
+		})
+	}
+	
+	/**
+	 * 获取耗材类别
+	 */
+	let gettbConsTypeList = () => {
+		datas.typeLists = ['全部']
+		getConsGrpupList({
+			page: 0,
+			size: 30,
+			shopId: uni.getStorageSync("shopId"),
+		}).then(res => {
+			datas.typeList = res
+			res.forEach(ele => {
+				datas.typeLists.push(ele.name)
+			})
+		})
+	}
 	function changeNowStatusIndex(i) {
 		nowStatusIndex.value = i
 		showStatus.value = false
@@ -161,19 +192,7 @@
 			getList(datas.typeList[i - 1].id)
 		}
 	}
-	let gettbConsTypeList = () => {
-		datas.typeLists = ['全部']
-		tbConsTypeList({
-			page: 0,
-			size: 30,
-			shopId: uni.getStorageSync("shopId"),
-		}).then(res => {
-			datas.typeList = res.content
-			res.content.forEach(ele => {
-				datas.typeLists.push(ele.conTypeName)
-			})
-		})
-	}
+
 
 
 	/**
@@ -239,18 +258,7 @@
 	// 	let res = await hasPermission(d)
 	// 	return res
 	// }
-	async function getList(d = "") {
-		viewConInfoFlowget({
-			shopId: uni.getStorageSync("shopId"),
-			conName: datas.conName,
-			conTypeId: d,
-			size: 100,
-			page: 0
-		}).then(res => {
-			datas.list = res.content
-		})
-	}
-
+	
 	function inputEvent(d) {
 		datas.conName = d.detail.value.replace(/\s*/g, "");
 		getList()