From a327cd74b1431ad30e49f16458624f51008a3f68 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 5 Aug 2021 10:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=8F=91=E8=B4=A7=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=20=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/delivery/order.vue  | 1 +
 canteen/pages/purchase/detail.vue | 2 +-
 supplier/pages/gonghuo/detail.vue | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/canteen/pages/delivery/order.vue b/canteen/pages/delivery/order.vue
index bdba113..765ef70 100644
--- a/canteen/pages/delivery/order.vue
+++ b/canteen/pages/delivery/order.vue
@@ -151,6 +151,7 @@
 					item.loading_text = '正在加载中...';
 					item.list = [];
 					this.getData({refresh: true,type: this.current});
+					console.log('执行了')
 				}, 200);
 			}
 		}
diff --git a/canteen/pages/purchase/detail.vue b/canteen/pages/purchase/detail.vue
index a0ba00b..fe0a5fa 100644
--- a/canteen/pages/purchase/detail.vue
+++ b/canteen/pages/purchase/detail.vue
@@ -76,7 +76,7 @@
 				</view>
 				<view v-else-if="type == '已收货' || type == '已入库'" class="lf-row-between">
 					<button class="btn btn1" @click="$url('/pages/purchase/launch?p_sn='+ order.p_sn+'&enter_type=2')">复用采购单</button>
-					<view class="lf-font-32" style="color: #11D189;">已完成</view>
+					<view class="lf-font-32" style="color: #11D189;">{{order.state}}</view>
 				</view>
 				<view v-else-if="type == '已撤销'" class="lf-row-between">
 					<button class="btn btn1" @click="$url('/pages/purchase/launch?p_sn='+ order.p_sn+'&enter_type=2')">复用采购单</button>
diff --git a/supplier/pages/gonghuo/detail.vue b/supplier/pages/gonghuo/detail.vue
index 30d3074..1696c6f 100644
--- a/supplier/pages/gonghuo/detail.vue
+++ b/supplier/pages/gonghuo/detail.vue
@@ -357,7 +357,7 @@
 					deliver_man: driver_name,
 					car_license: l_p_num
 				}).then(res => {
-					this.$msg('确认收货成功');
+					this.$msg('确认发货成功');
 					this.getData();
 				});
 			}