全部库存

ghsApp/src/admin/stat/stock.vue

@@ -10,7 +10,11 @@
 					<button class="admin-button-com middle default" @click="downStock()">下载Excel</button>
 				</view>
 			</view>
-			<view class="top-bar" style="margin-left:80upx;">实时库存</view>
+			<view class="top-bar" style="margin-left:80upx;font-size:38upx;padding:30upx 0 20upx 0;">
+				<text @click="showStock">实时库存</text>
+				<text style="margin-left:50upx;" @click="showAllItem">全部花材</text>
+			</view>
+			<view style="margin-left:30upx;padding-top:10upx;padding-bottom:10upx;font-size:26upx;">这个页面，请使用app打开，小程序打开会卡死</view>
 			<scroll-view scroll-y scroll-with-animation class="main-view">
 				<view class="space-view ex-table">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
@@ -77,7 +81,7 @@
 												</t-td>
 												<t-td>
 													<view style="font-size:28upx;color:red;" @click="pageTo({url:'/admin/item/detail?id='+productItem.id})">
-														¥{{productItem.cost?parseFloat(productItem.cost):0}}
+														¥{{productItem.avCost?parseFloat(productItem.avCost):0}}
 													</view>
 												</t-td>
 											</t-tr>
@@ -206,7 +210,21 @@ export default {
 			this.shopId = this.getMyShopInfo.id;
 			let type = '';
 			let that = this
+			uni.showLoading()
 			getProductDataApi({ type, shopId: this.shopId,status:0,requestType:'hasStockList'}).then(res=>{
+				uni.hideLoading()
+				if(res.code == 1){
+					that.classItemData = res.data.classItem ? res.data.classItem : []
+				}
+			})
+		},
+		showAllItem(){
+			this.shopId = this.getMyShopInfo.id;
+			let type = '';
+			let that = this
+			uni.showLoading()
+			getProductDataApi({ type, shopId: this.shopId,status:0,requestType:'itemList'}).then(res=>{
+				uni.hideLoading()
 				if(res.code == 1){
 					that.classItemData = res.data.classItem ? res.data.classItem : []
 				}
@@ -230,11 +248,7 @@ export default {
 		}
 	}
 	.top-bar {
-		position: absolute;
-		left: 0;
-		display: flex;
 		width: 100%;
-		top:130upx;
 		z-index: 20;
 		.bar{
 			width: 50%;
@@ -246,7 +260,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 90upx;
+		margin-top:10upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {