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/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/detail.vue b/canteen/pages/purchase/detail.vue
index 8a955d1..93ba4e1 100644
--- a/canteen/pages/purchase/detail.vue
+++ b/canteen/pages/purchase/detail.vue
@@ -31,9 +31,13 @@
司机
{{order.deliver_man}}
-
+
联系电话
- {{order.deliver_phone}}
+ {{order.deliver_phone}}
+
+
+ 收货时间
+ {{order.deadline}}
@@ -168,6 +172,11 @@
}
},
methods: {
+ call(phone) {
+ uni.makePhoneCall({
+ phoneNumber: phone //仅为示例
+ });
+ },
// 移除图片
removeInage(current){
this.voucher_list.splice(current, 1);
@@ -241,7 +250,8 @@
let actionState = [
'订单已完成',
'订单已退款',
- '订单已撤销'
+ '订单已撤销',
+ '订单已确认，物资入库'
];
if(actionState.includes(item.action)){
item.isFinished = true;
@@ -293,12 +303,22 @@
},
// 改变订单状态
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 }}
diff --git a/canteen/pages/purchase/order.vue b/canteen/pages/purchase/order.vue
index 6b132ad..9e17143 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 }}
@@ -216,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 ddcf886..2d21d1c 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 }}
@@ -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;