From c67fc2f198a5d8232d2bec4076a75c12e1ff1086 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 4 Aug 2021 16:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/classification/warehouse.vue | 2 +-
 canteen/pages/purchase/receipt.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/canteen/pages/classification/warehouse.vue b/canteen/pages/classification/warehouse.vue
index e0f0323..c5f37f8 100644
--- a/canteen/pages/classification/warehouse.vue
+++ b/canteen/pages/classification/warehouse.vue
@@ -16,7 +16,7 @@
 						<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 class="lf-font-24 lf-color-555 lf-m-t-10">入库时间：{{ item.created_at }}</view>
+							<view class="lf-font-24 lf-color-555 lf-m-t-10">入库时间：{{ item.created_at_text }}</view>
 						</view>
 						<u-icon name="checkmark-circle-fill" size="40" color="#11D189" v-if="item.checked"></u-icon>
 					</label>
diff --git a/canteen/pages/purchase/receipt.vue b/canteen/pages/purchase/receipt.vue
index 42400d1..8112f4b 100644
--- a/canteen/pages/purchase/receipt.vue
+++ b/canteen/pages/purchase/receipt.vue
@@ -8,7 +8,7 @@
 			</view>
 			<view class="lf-row-between lf-m-t-30">
 				<view>订购数</view>
-				<view class="lf-color-black">{{ item.purchase_number }}</view>
+				<view class="lf-color-black" v-if="item.material && item.purchase_number">{{ item.purchase_number }} <text class="lf-m-l-50">{{item.material.unit.unit_name}}</text></view>
 			</view>
 			<view class="lf-row-between lf-m-t-30">
 				<view>实到数</view>