From 55877af1e0312a920fd0588148e9415ccf6be528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Sat, 31 Jul 2021 18:18:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/delivery/apply.vue |  7 ++++++-
 supplier/pages/gonghuo/order.vue | 23 +++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/canteen/pages/delivery/apply.vue b/canteen/pages/delivery/apply.vue
index 3776533..f2b1f7e 100644
--- a/canteen/pages/delivery/apply.vue
+++ b/canteen/pages/delivery/apply.vue
@@ -14,7 +14,12 @@
 		<!-- 物料table -->
 		<view class="lf-p-32 lf-p-t-30 lf-p-b-30 lf-w-100 lf-h-maxcontent lf-border-box">
 			<view class="lf-font-32 lf-color-black lf-font-bold lf-m-b-20">物资明细</view>
-			<wyb-table :headers="headers" :contents="contents" contentBgColor="#ecfaf5" :first-line-fixed="true" @onInputChange="onInputChange" width="max-content" height="800rpx"></wyb-table>
+			<wyb-table :headers="headers" :contents="contents" 
+				contentBgColor="#ecfaf5" 
+				:first-line-fixed="true" 
+				@onInputChange="onInputChange" 
+				width="max-content" height="800rpx"
+				v-if="contents.length"></wyb-table>
 		</view>
 		<!-- 操作按钮 -->
 		<view class="fixed-bottom">
diff --git a/supplier/pages/gonghuo/order.vue b/supplier/pages/gonghuo/order.vue
index b0cd41a..0400aa2 100644
--- a/supplier/pages/gonghuo/order.vue
+++ b/supplier/pages/gonghuo/order.vue
@@ -15,7 +15,7 @@
 					<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-color-gray">采购方</view>
-							<view class="lf-color-black">{{ item.p_name }}</view>
+							<view class="lf-color-black">{{ item.canteen.canteen_name }}</view>
 						</view>
 						<view class="lf-row-between item">
 							<view class="lf-color-gray">发单时间</view>
@@ -31,7 +31,7 @@
 						</view>
 						<view class="lf-row-between item">
 							<view class="lf-color-gray">订单状态</view>
-							<view class="quoted-price">{{ item.state }}</view>
+							<view :class="stateClass(item.state)">{{ item.state }}</view>
 						</view>
 					</view>
 					<view class="loading-more">
@@ -68,6 +68,10 @@
 					name: '待发货',
 					list: [],
 					..._public
+				},{
+					name: '已发货',
+					list: [],
+					..._public
 				},{
 					name: '已完成',
 					list: [],
@@ -81,6 +85,21 @@
 				windowHeight: 0
 			}
 		},
+		computed: {
+			stateClass(){
+				return function(val){
+					let class_name = {
+						'已发货': 'passed',
+						'已收货': 'passed',
+						'已入库': 'passed',
+						'备货中': 'wait',
+						'待接单': 'quoted-price',
+						'已退单': 'refuse'
+					}
+					return class_name[val];
+				}
+			}
+		},
 		onLoad(){
 			this.windowHeight = uni.getSystemInfoSync().windowHeight;
 			this.getData();

From 7006e452acfd249c821bf354f49206332a419d93 Mon Sep 17 00:00:00 2001
From: shuixiang <mr.shuixiang@aliyun.com>
Date: Sat, 31 Jul 2021 19:41:05 +0800
Subject: [PATCH 2/2] no message

---
 canteen/pages/purchase/detail.vue | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/canteen/pages/purchase/detail.vue b/canteen/pages/purchase/detail.vue
index 87237f7..e856e0e 100644
--- a/canteen/pages/purchase/detail.vue
+++ b/canteen/pages/purchase/detail.vue
@@ -108,12 +108,30 @@
 					},{
 						key: 'spec',
 						label: '规格'
+					},{
+						key: 'brand',
+						label: '品牌'
+					},{
+						key: 'quality_level',
+						label: '品级'
+					},{
+						label: '编号',
+						key: 'm_sn'
+					},{
+						label: '供应商',
+						key: 'supplier_name'
 					},{
 						key: 'pre_tax_price',
 						label: '税前价格'
 					},{
 						key: 'after_tax_price',
 						label: '税后价格'
+					},{
+						key: 'purchase_limit',
+						label: '起购数'
+					},{
+						key: 'purchase_number',
+						label: '采购数量'
 					}],
 				contents: [],
 				order: {},
@@ -219,10 +237,14 @@
 						return {
 							name: item.material.m_name,
 							spec: item.spec.name,
+							brand: item.material.brand,
+							quality_level: item.material.quality_level,
+							m_sn: item.material.m_sn,
+							supplier_name: this.order.supplier.supplier_name,
 							pre_tax_price: item.total_tax_amount,
 							after_tax_price: item.total_non_tax_amount,
-							spec_id: item.spec.id,
-							material_id: item.material.id
+							purchase_limit: item.p_order_item.purchase_limit,
+							purchase_number: item.purchase_number
 						}
 					})
 					this.contents = contents;