Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-supplychain

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>

canteen/pages/purchase/receipt.vue

@@ -8,20 +8,20 @@
 			</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>
 				<view class="lf-flex">
 					<input class="input" placeholder="0" type="number" v-model="item.reachNum" @blur="inputBlur(index, 'real_reach_number', $event)" />
-					<text class="lf-color-black">斤</text>
+					<text class="lf-color-black" v-if="item.material && item.material.unit">{{item.material.unit.unit_name}}</text>
 				</view>
 			</view>
 			<view class="lf-row-between lf-m-t-30">
 				<view>实收数</view>
 				<view class="lf-flex">
 					<input class="input" placeholder="0" type="number" v-model="item.receiveNum" @blur="inputBlur(index, 'real_receive_number', $event)" />
-					<text class="lf-color-black">斤</text>
+					<text class="lf-color-black" v-if="item.material && item.material.unit">{{item.material.unit.unit_name}}</text>
 				</view>
 			</view>
 		</view>