From b119c13ee123b1bf8790b482143293c7c87bc70d Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Mon, 13 Feb 2023 18:09:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=86=9C=E4=BA=A7=E5=93=81=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/stock/mana.vue | 58 ++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/pages/stock/mana.vue b/pages/stock/mana.vue
index 0719937..133b23f 100644
--- a/pages/stock/mana.vue
+++ b/pages/stock/mana.vue
@@ -83,8 +83,17 @@
 					&>text{
 						font-size:24rpx;
 						color:#999;
+						&.detailType{
+							flex-shrink: 0;
+							color:#FBA83C;
+							margin-right:20rpx;
+						}
+						&.warehouse{
+							color:#999;
+						}
 					}
 					&>.btns{
+						flex-shrink: 0;
 						margin-left:auto;
 						button{
 							padding:0;
@@ -130,23 +139,40 @@
 
 		<scroll-view scroll-y @scrolltolower="search">
 			<view class="card item" v-for="(v,k) in list" :key="k">
-				<view class="info">
-					<text>{{v.agriculturalGoods}}</text>
-					<text class="over">{{v.substanceName}}</text>
-					<text v-if="searchVal.substanceType=='nz'">({{v.specDescribe}})</text>
-					<text v-if="v.replenishment">补货量≥{{v.replenishment}}{{v.unit}}</text>
-				</view>
-				<view class="company">
-					<text style="--c:#FBA83C;margin-right:14rpx;">{{v.detailType}}</text>
-					<text style="--c:#999;" class="over">{{v.supplierName}}</text>
-				</view>
-				<view class="num">
-					<text>库存量：{{v.equivalentInventory||0}}{{v.packgeUnit}}</text>
-					<view class="btns">
-						<button class="cu-btn" @click="toList('out',v)">出库</button>
-						<button class="cu-btn" @click="toList('in',v)">入库</button>
+				<template v-if="searchVal.substanceType=='nz'">
+					<view class="info">
+						<text>{{v.agriculturalGoods}}</text>
+						<text class="over">{{v.substanceName}}</text>
+						<text>({{v.specDescribe}})</text>
+						<text v-if="v.replenishment">补货量≥{{v.replenishment}}{{v.unit}}</text>
+					</view>
+					<view class="company">
+						<text style="--c:#FBA83C;margin-right:14rpx;">{{v.detailType}}</text>
+						<text style="--c:#999;" class="over">{{v.supplierName}}</text>
+					</view>
+					<view class="num">
+						<text>库存量：{{v.equivalentInventory||0}}{{v.packgeUnit}}</text>
+						<view class="btns">
+							<button class="cu-btn" @click="toList('out',v)">出库</button>
+							<button class="cu-btn" @click="toList('in',v)">入库</button>
+						</view>
+					</view>
+				</template>
+				<template v-else>
+					<view class="info">
+						<text>{{v.agriculturalGoods}}</text>
+						<text class="over">{{v.substanceName}}</text>
+						<text style="flex-shrink: 0;margin-left:auto;color:#333;">{{v.equivalentInventory||0}}{{v.unit}}</text>
+					</view>
+					<view class="num">
+						<text class="detailType">{{v.detailType}}</text>
+						<text class="warehouse over">{{v.wareHouseName}}</text>
+						<view class="btns">
+							<button class="cu-btn" @click="toList('out',v)">出库</button>
+							<button class="cu-btn" @click="toList('in',v)">入库</button>
+						</view>
 					</view>
-				</view>
+				</template>
 			</view>
 			<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>