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 1/2] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9=20=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=AE=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 @@ - 已完成 + {{order.state}} 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(); }); } From 3a1188fcf47334597d368eebd071ecd52465ac8c Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Thu, 5 Aug 2021 11:24:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- canteen/pages/delivery/detail.vue | 6 +----- canteen/pages/delivery/order.vue | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/canteen/pages/delivery/detail.vue b/canteen/pages/delivery/detail.vue index 1fb8e80..2d4ea51 100644 --- a/canteen/pages/delivery/detail.vue +++ b/canteen/pages/delivery/detail.vue @@ -18,10 +18,6 @@ 采购单 {{order.sheet[0].purchase.p_sn}} - - 批次号 - {{order.batch_sn}} - 联系电话 {{order.sheet[0].purchase.contact_phone}} @@ -144,7 +140,7 @@ quality_level: item.material.quality_level, m_sn: item.material.m_sn, supplier_name: item.purchase.supplier.supplier_name, - purchase_id: item.purchase_id, + purchase_id: item.purchase.batch_sn, delivery_number: item.out_number, unit: item?.material?.unit?.unit_name || '', category: item?.material?.category?.m_cate_name || '' diff --git a/canteen/pages/delivery/order.vue b/canteen/pages/delivery/order.vue index 765ef70..bdba113 100644 --- a/canteen/pages/delivery/order.vue +++ b/canteen/pages/delivery/order.vue @@ -151,7 +151,6 @@ item.loading_text = '正在加载中...'; item.list = []; this.getData({refresh: true,type: this.current}); - console.log('执行了') }, 200); } }