From 29f02f68f8bd813fabe199505b5d8f294246a875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 2 Aug 2021 15:29:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=9F=E5=A0=82=E7=AB=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/classification/material.vue  | 5 ++++-
 canteen/pages/classification/warehouse.vue | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/canteen/pages/classification/material.vue b/canteen/pages/classification/material.vue
index 016757b..dd74684 100644
--- a/canteen/pages/classification/material.vue
+++ b/canteen/pages/classification/material.vue
@@ -13,7 +13,10 @@
 				:style="{height: 'calc('+ windowHeight +'px - 222rpx)', width:is_search_ing?'100%':'550rpx'}">
 				<view class="supplier-item" v-for="(item, index) in tab_list[current].list" :key="index">
 					<label class="lf-row-between" @click="switchChecked(item)">
-						<view style="min-height: 40rpx; max-height: max-content; width: 440rpx;">{{ item.material_name }}</view>
+						<view style="min-height: 40rpx; max-height: max-content; width: 440rpx;">
+							<view class="lf-font-28 lf-color-black">{{ item.material_name }}·{{ item.spec_name }}</view>
+							<view class="lf-font-24 lf-color-555 lf-m-t-10">{{ item.supplier_name }}</view>
+						</view>
 						<u-icon name="checkmark-circle-fill" size="40" color="#11D189" v-if="item.checked"></u-icon>
 					</label>
 				</view>
diff --git a/canteen/pages/classification/warehouse.vue b/canteen/pages/classification/warehouse.vue
index 4e362b7..06dc6cd 100644
--- a/canteen/pages/classification/warehouse.vue
+++ b/canteen/pages/classification/warehouse.vue
@@ -13,7 +13,10 @@
 				:style="{height: 'calc('+ windowHeight +'px - 222rpx)', width:is_search_ing?'100%':'550rpx'}">
 				<view class="supplier-item" v-for="(item, index) in tab_list[current].list" :key="index">
 					<label class="lf-row-between" @click="switchChecked(item)">
-						<view style="height: 40rpx;">{{ item.material_name }}</view>
+						<view style="min-height: 40rpx; max-height: max-content; width: 440rpx;">
+							<view class="lf-font-28 lf-color-black">{{ item.material_name }}·{{ item.spec_name }}</view>
+							<view class="lf-font-24 lf-color-555 lf-m-t-10">批次号：{{ item.batch_sn }}</view>
+						</view>
 						<u-icon name="checkmark-circle-fill" size="40" color="#11D189" v-if="item.checked"></u-icon>
 					</label>
 				</view>