From 59fc57e8331c0ccc091465f876ffde22d65cbc08 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 4 Aug 2021 15:34:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
canteen/pages/delivery/detail.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/canteen/pages/delivery/detail.vue b/canteen/pages/delivery/detail.vue
index 7ec60f2..8900f55 100644
--- a/canteen/pages/delivery/detail.vue
+++ b/canteen/pages/delivery/detail.vue
@@ -119,7 +119,8 @@
let actionState = [
'订单已完成',
'订单已退款',
- '订单已撤销'
+ '订单已撤销',
+ '已出库'
];
if(actionState.includes(item.action)){
item.isFinished = true;
From b03f0d26f673e0279d54b4329aa43f392524239c Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 4 Aug 2021 15:48:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=AD=A5=E9=AA=A4=E6=9D=A1=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
supplier/pages/gonghuo/detail.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/supplier/pages/gonghuo/detail.vue b/supplier/pages/gonghuo/detail.vue
index a461e50..30d3074 100644
--- a/supplier/pages/gonghuo/detail.vue
+++ b/supplier/pages/gonghuo/detail.vue
@@ -214,7 +214,8 @@
let actionState = [
'订单已完成',
'订单已退款',
- '订单已撤销'
+ '订单已撤销',
+ '订单已确认，物资入库'
]
if(actionState.includes(item.action)){
item.isFinished = true;
From 3729e9171be0726bebb7d4767a866f93b04261fa Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 4 Aug 2021 15:58:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E8=B5=84?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
canteen/pages/classification/warehouse.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/canteen/pages/classification/warehouse.vue b/canteen/pages/classification/warehouse.vue
index 0321a70..e0f0323 100644
--- a/canteen/pages/classification/warehouse.vue
+++ b/canteen/pages/classification/warehouse.vue
@@ -16,7 +16,7 @@
{{ item.material_name }}·{{ item.spec_name }}
批次号：{{ item.batch_sn }}
- 入库时间：{{ item.in_warehouse_time }}
+ 入库时间：{{ item.created_at }}