From 6219a23c6989f4092beba55e64dfaed019c7cba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Tue, 3 Aug 2021 17:04:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
canteen/pages/purchase/detail.vue | 76 +++++++++++++++++--------------
1 file changed, 41 insertions(+), 35 deletions(-)
diff --git a/canteen/pages/purchase/detail.vue b/canteen/pages/purchase/detail.vue
index 93ba4e1..528280c 100644
--- a/canteen/pages/purchase/detail.vue
+++ b/canteen/pages/purchase/detail.vue
@@ -20,26 +20,24 @@
-
+
-
-
- 车辆
- {{order.car_license}}
-
-
- 司机
- {{order.deliver_man}}
-
-
- 联系电话
- {{order.deliver_phone}}
-
-
- 收货时间
- {{order.deadline}}
-
-
+
+ 车辆
+ {{order.car_license}}
+
+
+ 司机
+ {{order.deliver_man}}
+
+
+ 联系电话
+ {{order.deliver_phone}}
+
+
+ 收货时间
+ {{order.deadline_text}}
+
证明材料-供应端
@@ -303,23 +301,31 @@
},
// 改变订单状态
orderStateChange(state){
- 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());
- })
+ let that = this;
+ if(state == '已退单'){
+ uni.showModal({
+ title: '温馨提示',
+ content: '退单前请与供应商协商，以免造成损失！确定继续退单操作吗？',
+ confirmColor: '#FF0000',
+ cancelColor: '#11D189',
+ success: result => {
+ if(result.confirm){
+ $change();
+ }
}
- }
- })
+ })
+ }else{
+ $change();
+ }
+
+ function $change(){
+ that.$http(that.API.API_CANTEEN_PURCHASEUPDATE, {
+ p_sn: that.p_sn,
+ state: state
+ }).then(res => {
+ that.$msg('操作成功').then(()=> that.getData());
+ })
+ }
}
}
}
From fd9b88216f28074bea6136810d4396e90784ec8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Tue, 3 Aug 2021 17:25:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E4=BB=B7?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
supplier/pages/order/index.vue | 75 ++++++++++++++++------------------
1 file changed, 35 insertions(+), 40 deletions(-)
diff --git a/supplier/pages/order/index.vue b/supplier/pages/order/index.vue
index f2c23a4..5727bd9 100644
--- a/supplier/pages/order/index.vue
+++ b/supplier/pages/order/index.vue
@@ -13,16 +13,21 @@
:refresher-triggered="tabItem.isRefresher"
@refresherrefresh="onRefresherrefresh">
-
- 订单状态
- {{ item.state }}
+
+ 报价单号
+ {{ item.q_sn }}
-
- 批次号 {{ item.batch_sn }}
+
+ 批次号
+ {{ item.batch_sn }}
-
- 报价单号 {{ item.q_sn }}
- {{ item.deadline }}
+
+ 订单状态
+ {{ item.state }}
+
+
+ 创建时间
+ {{ item.deadline_text }}
@@ -164,41 +169,31 @@
padding: 0 20rpx;
box-sizing: border-box;
margin-bottom: 30rpx;
- .upper{
- width: 100%;
+ .item{
padding: 20rpx 0;
- // border-bottom: 1rpx solid #e5e5e5;
box-sizing: border-box;
- .order-btn{
- width: max-content;
- height: 62rpx;
- border-radius: 32rpx;
- // border: 2rpx solid #777777;
- // padding: 0 20rpx;
- line-height: 60rpx;
- font-size: 28rpx;
- }
- // 已通过
- .quoted-price{
- color: #777777;
- }
- // 待发起
- .wait{
- color: #1833F2;
- }
- // 待审核
- .passed{
- color: #0BCE5F;
- }
- // 未通过
- .refuse{
- color: #FF0000;
+ width: 100%;
+ font-size: 28rpx;
+ &:last-child{
+ border-bottom: none;
}
}
- .lower{
- padding: 20rpx 0;
- font-size: 24rpx;
- color: #777777;
- }
+ }
+
+ // 已通过
+ .quoted-price{
+ color: #777777;
+ }
+ // 待发起
+ .wait{
+ color: #1833F2;
+ }
+ // 待审核
+ .passed{
+ color: #0BCE5F;
+ }
+ // 未通过
+ .refuse{
+ color: #FF0000;
}
From 3ca589605e9368145b78243d614c4749ad16cc8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Tue, 3 Aug 2021 17:27:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?=
=?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
supplier/pages/order/detail.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/supplier/pages/order/detail.vue b/supplier/pages/order/detail.vue
index 3f5863e..411f07e 100644
--- a/supplier/pages/order/detail.vue
+++ b/supplier/pages/order/detail.vue
@@ -21,6 +21,10 @@
关联食堂
{{ (order.canteen && order.canteen.canteen_name) || '' }}
+
+ 创建时间
+ {{ order.deadline_text }}
+