From 605ccba77b3b379df30859e270a9a3c71d8afe8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 4 Aug 2021 14:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/components/wyb-table/wyb-table.vue  | 2 +-
 canteen/pages/purchase/detail.vue           | 8 ++++++--
 canteen/pages/purchase/receipt.vue          | 2 +-
 supplier/components/wyb-table/wyb-table.vue | 2 +-
 supplier/pages/gonghuo/order.vue            | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/canteen/components/wyb-table/wyb-table.vue b/canteen/components/wyb-table/wyb-table.vue
index 1b421ca..b18924a 100644
--- a/canteen/components/wyb-table/wyb-table.vue
+++ b/canteen/components/wyb-table/wyb-table.vue
@@ -151,7 +151,7 @@
 							:disabled="content.disabled || false"
 							v-if="isObject(autoContentItem(cIndex, hIndex), 'edit')" 
 							:style="{minHeight: (minHeight[1] || minHeight[0]) + 'rpx'}"
-							placeholder-style="30rpx"
+							placeholder-style="font-size: 30rpx"
 							:type="autoContentItem(cIndex, hIndex).type || 'number'"
 							@blur="inputBlur(cIndex, hIndex, $event)" 
 							:value="autoContentItem(cIndex, hIndex).value" />
diff --git a/canteen/pages/purchase/detail.vue b/canteen/pages/purchase/detail.vue
index c45a045..a0ba00b 100644
--- a/canteen/pages/purchase/detail.vue
+++ b/canteen/pages/purchase/detail.vue
@@ -38,7 +38,7 @@
 					<view class="lf-font-bold">{{ order.batch_sn }}</view>
 				</view>
 				<view class="lf-row-between list">
-					<view>收货时间</view>
+					<view>预计收货时间</view>
 					<view class="lf-font-bold">{{order.deadline_text}}</view>
 				</view>
 				<view class="list" v-if="supplier_voucher.length">
@@ -55,7 +55,7 @@
 				</view>
 			</view>
 			<self-line></self-line>
-			<view class="lf-m-t-30 lf-m-l-32">
+			<view class="lf-m-t-30 lf-m-l-32 lf-m-r-32">
 				<view class="lf-font-32 lf-color-black lf-font-bold lf-m-b-20">物资明细</view>
 				<wyb-table :first-line-fixed="true" contentBgColor="#ecfaf5" :headers="headers" :contents="contents" width="max-content" height="80vh"></wyb-table>
 			</view>
@@ -512,4 +512,8 @@
 			}
 		}
 	}
+	// 去掉u-button 外边框线
+	/deep/.u-hairline-border::after{
+		border: none;
+	}
 </style>
diff --git a/canteen/pages/purchase/receipt.vue b/canteen/pages/purchase/receipt.vue
index 79e23fd..42400d1 100644
--- a/canteen/pages/purchase/receipt.vue
+++ b/canteen/pages/purchase/receipt.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="card" v-for="(item, index) in list" :key="index">
 			<view class="lf-row-between">
-				<view class="lf-color-black lf-font-bold" v-if="item.material.m_name">{{ item.material.m_name }}</view>
+				<view class="lf-color-black lf-font-bold" v-if="item.material && item.material.m_name">{{ item.material.m_name }}</view>
 				<!-- 修改功能先隐藏 -->
 				<!-- <view style="color: #11D189;" @click="showEdit">修改</view> -->
 			</view>
diff --git a/supplier/components/wyb-table/wyb-table.vue b/supplier/components/wyb-table/wyb-table.vue
index b9b0b12..6106439 100644
--- a/supplier/components/wyb-table/wyb-table.vue
+++ b/supplier/components/wyb-table/wyb-table.vue
@@ -151,7 +151,7 @@
 							:disabled="content.disabled || false"
 							v-if="isObject(autoContentItem(cIndex, hIndex), 'edit')" 
 							:style="{minHeight: (minHeight[1] || minHeight[0]) + 'rpx'}"
-							placeholder-style="30rpx"
+							placeholder-style="font-size: 30rpx"
 							:type="autoContentItem(cIndex, hIndex).type || 'number'"
 							@blur="inputBlur(cIndex, hIndex, $event)" 
 							:value="autoContentItem(cIndex, hIndex).value" />
diff --git a/supplier/pages/gonghuo/order.vue b/supplier/pages/gonghuo/order.vue
index 5b025ce..a0f3280 100644
--- a/supplier/pages/gonghuo/order.vue
+++ b/supplier/pages/gonghuo/order.vue
@@ -31,7 +31,7 @@
 						</view>
 						<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 class="lf-color-black">{{ item.cate_number }}类</view>
 						</view>
 						<view class="lf-row-between item" v-if="item.state">
 							<view class="lf-color-gray">订单状态</view>