From 7dad0b2f1f8b3390b3b7386e4343a97a8179d509 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Tue, 3 Aug 2021 15:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?=
 =?UTF-8?q?=E4=BE=9B=E8=B4=A7=E8=AE=A2=E5=8D=95=E6=98=BE=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/purchase/order.vue | 18 +++++++++++-------
 supplier/pages/gonghuo/order.vue | 12 ++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/canteen/pages/purchase/order.vue b/canteen/pages/purchase/order.vue
index 6b132ad..e2b6152 100644
--- a/canteen/pages/purchase/order.vue
+++ b/canteen/pages/purchase/order.vue
@@ -13,31 +13,35 @@
 					:refresher-triggered="tabItem.isRefresher" 
 					@refresherrefresh="onRefresherrefresh">
 					<view class="card" v-for="(item, index) in tabItem.list" :key="item.id" @click="$url('/pages/purchase/detail?p_sn='+ item.p_sn)">
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.supplier.supplier_name">
 							<view class="lf-color-gray">供应商</view>
 							<view class="lf-color-black">{{ item.supplier.supplier_name }}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.batch_sn">
 							<view class="lf-color-gray">批次号</view>
 							<view class="lf-color-black">{{item.batch_sn}}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.p_sn">
 							<view class="lf-color-gray">订单号</view>
 							<view class="lf-color-black">{{item.p_sn}}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.send_time">
 							<view class="lf-color-gray">发单时间</view>
 							<view class="lf-color-black">{{ item.send_time }}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.deadline">
+							<view class="lf-color-gray">收货时间</view>
+							<view class="lf-color-black">{{ item.deadline }}</view>
+						</view>
+						<view class="lf-row-between item" v-if="item.receive_time">
 							<view class="lf-color-gray">送达时间</view>
 							<view class="lf-color-black">{{ item.receive_time }}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.cate_number">
 							<view class="lf-color-gray">商品种类</view>
 							<view class="lf-color-black">{{item.cate_number}}类</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.state">
 							<view class="lf-color-gray">订单状态</view>
 							<view :class="stateClass(item.state)">{{ item.state }}</view>
 						</view>
diff --git a/supplier/pages/gonghuo/order.vue b/supplier/pages/gonghuo/order.vue
index ddcf886..435051f 100644
--- a/supplier/pages/gonghuo/order.vue
+++ b/supplier/pages/gonghuo/order.vue
@@ -13,27 +13,27 @@
 					:refresher-triggered="tabItem.isRefresher" 
 					@refresherrefresh="onRefresherrefresh">
 					<view class="card" v-for="(item, index) in tabItem.list" :key="item.id" @click="$url('/pages/gonghuo/detail?p_sn='+ item.p_sn)">
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.canteen.canteen_name">
 							<view class="lf-color-gray">采购方</view>
 							<view class="lf-color-black">{{ item.canteen.canteen_name }}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.created_at">
 							<view class="lf-color-gray">发单时间</view>
 							<view class="lf-color-black">{{ item.created_at }}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.deadline_text">
 							<view class="lf-color-gray">预计收货时间</view>
 							<view class="lf-color-black">{{ item.deadline_text }}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.receive_time">
 							<view class="lf-color-gray">送达时间</view>
 							<view class="lf-color-black">{{ item.receive_time }}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.cate_number">
 							<view class="lf-color-gray">商品种类</view>
 							<view class="lf-color-black">{{ item.cate_number }}</view>
 						</view>
-						<view class="lf-row-between item">
+						<view class="lf-row-between item" v-if="item.state">
 							<view class="lf-color-gray">订单状态</view>
 							<view :class="stateClass(item.state)">{{ item.state }}</view>
 						</view>