From 2f547efacf442e2f0c3b062bafb748b6e332ab87 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Mon, 13 Feb 2023 18:28:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=20=E5=86=9C=E4=BA=A7=E5=93=81=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/stock/record.vue | 61 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/pages/stock/record.vue b/pages/stock/record.vue
index a5911aa..8c1d507 100644
--- a/pages/stock/record.vue
+++ b/pages/stock/record.vue
@@ -34,6 +34,7 @@
 					align-items: center;
 					border-bottom: 2rpx solid #D8D8D8;
 					padding-bottom:20rpx;
+					margin-bottom:20rpx;
 					text{
 						&:first-child{
 							flex-shrink: 0;
@@ -52,7 +53,6 @@
 					}
 				}
 				&>.plant-youbian{
-					margin-top:20rpx;
 					display:flex;
 					flex-direction: row-reverse;
 					align-items: center;
@@ -87,6 +87,36 @@
 						}
 					}
 				}
+				&>.info{
+					display:flex;
+					align-items: center;
+					text{
+						&:first-child{
+							min-width:80rpx;
+							height:40rpx;
+							line-height: 40rpx;
+							text-align: center;
+							background: #10C176;
+							border-radius: 0 20rpx 0 20rpx;
+							color:#fff;
+							margin-right:10rpx;
+						}
+						&:nth-child(3){
+							margin-left:10rpx;
+							color:#FBB65C;
+							font-size:24rpx;
+						}
+						&:nth-child(4){
+							color:#10C176;
+							margin-left:auto;
+						}
+					}
+				}
+				&>.date,&>.warehouse{
+					font-size:24rpx;
+					color:#333;
+					margin-top:10rpx;
+				}
 			}
 		}
 	}
@@ -103,13 +133,28 @@
 
 		<scroll-view scroll-y >
 			<view class="card" v-for="(v,k) in list" :key="k" @click="toDetail(v)">
-				<view class="head">
-					<text class="plant-rili"/> <text>批次号：{{v.inOutBatchNo}}</text> <text>{{v.inOutType}}</text>
-				</view>
-				<view class="plant-youbian"> <text :class="{nz:searchVal.type=='1'}" :data-unit="v.specDescribe">{{v.substanceName}}</text> </view>
-				<view class="company">
-					<text>{{v.supplier}}</text> <text>{{v.number}}{{v.packgeUnit}}(共{{v.equivalentAmount}}{{v.unit}})</text>
-				</view>
+				<template v-if="searchVal.type=='1'">
+					<view class="head">
+						<text class="plant-rili"/> <text>批次号：{{v.inOutBatchNo}}</text> <text>{{v.inOutType}}</text>
+					</view>
+					<view class="plant-youbian"> <text class="nz" :data-unit="v.specDescribe">{{v.substanceName}}</text> </view>
+					<view class="company">
+						<text>{{v.supplier}}</text> <text>{{v.number}}{{v.packgeUnit}}(共{{v.equivalentAmount}}{{v.unit}})</text>
+					</view>
+					<view class="date"> 操作时间：{{v.createTime}} </view>
+				</template>
+				<template v-else>
+					<view class="head">
+						<text class="plant-rili"/> <text>批次号：{{v.inOutBatchNo}}</text> <text>{{v.inOutType}}</text>
+					</view>
+					<view class="info">
+						<text>{{v.goodsType}}</text>
+						<text>{{v.substanceName}}</text><text>({{v.goodsDetailType}})</text>
+						<text>{{v.number}}{{v.unit}}</text>
+					</view>
+					<view class="date"> 操作时间：{{v.createTime}} </view>
+					<view class="warehouse"> 所在仓库：{{v.warehouseName}} </view>
+				</template>
 			</view>
 			<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>