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.in_warehouse_time }}</view>
+							<view class="lf-font-24 lf-color-555 lf-m-t-10">入库时间：{{ item.created_at }}</view>
 						</view>
 						<u-icon name="checkmark-circle-fill" size="40" color="#11D189" v-if="item.checked"></u-icon>
 					</label>

canteen/pages/delivery/detail.vue

@@ -119,7 +119,8 @@
 							let actionState = [
 								'订单已完成',
 								'订单已退款',
-								'订单已撤销'
+								'订单已撤销',
+								'已出库'
 							];
 							if(actionState.includes(item.action)){
 								item.isFinished = true;

supplier/pages/gonghuo/detail.vue

@@ -214,7 +214,8 @@
 							let actionState = [
 								'订单已完成',
 								'订单已退款',
-								'订单已撤销'
+								'订单已撤销',
+								'订单已确认，物资入库'
 							]
 							if(actionState.includes(item.action)){
 								item.isFinished = true;