From 7dad0b2f1f8b3390b3b7386e4343a97a8179d509 Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Tue, 3 Aug 2021 15:50:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E4=BE=9B=E8=B4=A7=E8=AE=A2=E5=8D=95=E6=98=BE=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- canteen/pages/purchase/order.vue | 18 +++++++++++------- supplier/pages/gonghuo/order.vue | 12 ++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/canteen/pages/purchase/order.vue b/canteen/pages/purchase/order.vue index 6b132ad..e2b6152 100644 --- a/canteen/pages/purchase/order.vue +++ b/canteen/pages/purchase/order.vue @@ -13,31 +13,35 @@ :refresher-triggered="tabItem.isRefresher" @refresherrefresh="onRefresherrefresh"> - + 供应商 {{ item.supplier.supplier_name }} - + 批次号 {{item.batch_sn}} - + 订单号 {{item.p_sn}} - + 发单时间 {{ item.send_time }} - + + 收货时间 + {{ item.deadline }} + + 送达时间 {{ item.receive_time }} - + 商品种类 {{item.cate_number}}类 - + 订单状态 {{ item.state }} diff --git a/supplier/pages/gonghuo/order.vue b/supplier/pages/gonghuo/order.vue index ddcf886..435051f 100644 --- a/supplier/pages/gonghuo/order.vue +++ b/supplier/pages/gonghuo/order.vue @@ -13,27 +13,27 @@ :refresher-triggered="tabItem.isRefresher" @refresherrefresh="onRefresherrefresh"> - + 采购方 {{ item.canteen.canteen_name }} - + 发单时间 {{ item.created_at }} - + 预计收货时间 {{ item.deadline_text }} - + 送达时间 {{ item.receive_time }} - + 商品种类 {{ item.cate_number }} - + 订单状态 {{ item.state }} From 0f4a28684fa4e4d7b1f3ccb9f2f8e8ccd08d5cdf Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Tue, 3 Aug 2021 16:12:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=80=80=E5=8D=95=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=97=B6=E9=97=B4=E9=BB=98=E8=AE=A4=E5=A1=AB?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- canteen/pages/purchase/detail.vue | 29 +++++++++++++++++++++++------ canteen/pages/purchase/launch.vue | 4 ++-- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/canteen/pages/purchase/detail.vue b/canteen/pages/purchase/detail.vue index e74f504..e12e6b7 100644 --- a/canteen/pages/purchase/detail.vue +++ b/canteen/pages/purchase/detail.vue @@ -35,6 +35,10 @@ 联系电话 {{order.deliver_phone}} + + 收货时间 + {{order.deadline}} + 证明材料-供应端 @@ -288,13 +292,26 @@ }, // 改变订单状态 orderStateChange(state){ - this.$http(this.API.API_CANTEEN_PURCHASEUPDATE, { - p_sn: this.p_sn, - state: state - }).then(res => { - console.log("orderStateChange", res); - this.$msg('操作成功').then(()=> this.getData()); + uni.showModal({ + title: '温馨提示', + content: '确定继续退单吗？', + confirmColor: '#FF0000', + cancelColor: '#11D189', + success: result => { + if(result.confirm){ + this.$http(this.API.API_CANTEEN_PURCHASEUPDATE, { + p_sn: this.p_sn, + state: state + }).then(res => { + console.log("orderStateChange", res); + this.$msg('操作成功').then(()=> this.getData()); + }) + } + } }) + + + } } } diff --git a/canteen/pages/purchase/launch.vue b/canteen/pages/purchase/launch.vue index 0556c92..9658a5a 100644 --- a/canteen/pages/purchase/launch.vue +++ b/canteen/pages/purchase/launch.vue @@ -25,8 +25,8 @@ 收货时间 - {{ '请选择收货时间...' }} - {{ date }} + + {{ date }} From 064a986df047989abd51f0e0e01707fb54c74827 Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Tue, 3 Aug 2021 16:28:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20=E5=87=BA=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=94=B5=E8=AF=9D=E4=B8=80=E9=94=AE=E6=8B=A8?= =?UTF-8?q?=E6=89=93=E4=B8=8E=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 | 9 +++++++-- canteen/pages/purchase/detail.vue | 12 +++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/canteen/pages/delivery/detail.vue b/canteen/pages/delivery/detail.vue index 541d40c..8f02dc1 100644 --- a/canteen/pages/delivery/detail.vue +++ b/canteen/pages/delivery/detail.vue @@ -14,9 +14,9 @@ 申请人 {{order.sheet[0].purchase.contact_name}} - + 联系电话 - {{order.sheet[0].purchase.contact_phone}} + {{order.sheet[0].purchase.contact_phone}} @@ -94,6 +94,11 @@ } }, methods: { + call(phone) { + uni.makePhoneCall({ + phoneNumber: phone //仅为示例 + }); + }, getData(){ this.$http(this.API.API_CANTEEN_OUTDETAIL, { o_sn: this.o_sn diff --git a/canteen/pages/purchase/detail.vue b/canteen/pages/purchase/detail.vue index e12e6b7..86d78d2 100644 --- a/canteen/pages/purchase/detail.vue +++ b/canteen/pages/purchase/detail.vue @@ -31,9 +31,9 @@ 司机 {{order.deliver_man}} - + 联系电话 - {{order.deliver_phone}} + {{order.deliver_phone}} 收货时间 @@ -170,6 +170,11 @@ } }, methods: { + call(phone) { + uni.makePhoneCall({ + phoneNumber: phone //仅为示例 + }); + }, // 预览图片 lookPopupImage(current){ if(this.voucher_list.length <= 0) return; @@ -252,7 +257,8 @@ let actionState = [ '订单已完成', '订单已退款', - '订单已撤销' + '订单已撤销', + '订单已确认，物资入库' ]; if(actionState.includes(item.action)){ item.isFinished = true; From 0660ce2ae37c2148a8e9ab641160363fa03cbb92 Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Tue, 3 Aug 2021 16:47:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8B=E5=88=92=E7=BA=BF=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- canteen/pages/delivery/order.vue | 2 +- canteen/pages/purchase/order.vue | 2 +- supplier/pages/gonghuo/order.vue | 2 +- supplier/pages/order/index.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/canteen/pages/delivery/order.vue b/canteen/pages/delivery/order.vue index 82ded7c..f076815 100644 --- a/canteen/pages/delivery/order.vue +++ b/canteen/pages/delivery/order.vue @@ -175,7 +175,7 @@ padding: 20rpx 0; box-sizing: border-box; width: 100%; - border-bottom: 1rpx solid #E5E5E5; + // border-bottom: 1rpx solid #E5E5E5; font-size: 28rpx; &:last-child{ border-bottom: none; diff --git a/canteen/pages/purchase/order.vue b/canteen/pages/purchase/order.vue index e2b6152..9e17143 100644 --- a/canteen/pages/purchase/order.vue +++ b/canteen/pages/purchase/order.vue @@ -220,7 +220,7 @@ padding: 20rpx 0; box-sizing: border-box; width: 100%; - border-bottom: 1rpx solid #E5E5E5; + // border-bottom: 1rpx solid #E5E5E5; font-size: 28rpx; &:last-child{ border-bottom: none; diff --git a/supplier/pages/gonghuo/order.vue b/supplier/pages/gonghuo/order.vue index 435051f..2d21d1c 100644 --- a/supplier/pages/gonghuo/order.vue +++ b/supplier/pages/gonghuo/order.vue @@ -194,7 +194,7 @@ padding: 20rpx 0; box-sizing: border-box; width: 100%; - border-bottom: 1rpx solid #E5E5E5; + // border-bottom: 1rpx solid #E5E5E5; font-size: 28rpx; &:last-child{ border-bottom: none; diff --git a/supplier/pages/order/index.vue b/supplier/pages/order/index.vue index a281c0a..f2c23a4 100644 --- a/supplier/pages/order/index.vue +++ b/supplier/pages/order/index.vue @@ -167,7 +167,7 @@ .upper{ width: 100%; padding: 20rpx 0; - border-bottom: 1rpx solid #e5e5e5; + // border-bottom: 1rpx solid #e5e5e5; box-sizing: border-box; .order-btn{ width: max-content;