diff --git a/common/js/request.js b/common/js/request.js
index 0259e1d..ecdb4fa 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -435,8 +435,8 @@ export default {
header: {
pageNum: params.pageNum,
pageSize: params.pageSize,
- orderByColumn: params.orderByColumn,
- isAsc: params.isAsc
+ orderByColumn: params.orderByColumn ? params.orderByColumn : "",
+ isAsc: params.isAsc ? params.isAsc : ""
}
})
return res[1].data;
@@ -455,8 +455,8 @@ export default {
method: 'POST',
data: params,
header: {
- orderByColumn: params.orderByColumn,
- isAsc: params.isAsc
+ orderByColumn: params.orderByColumn ? params.orderByColumn : "",
+ isAsc: params.isAsc ? params.isAsc : ""
}
})
return res[1].data;
@@ -467,8 +467,8 @@ export default {
method: 'POST',
data: params,
header: {
- orderByColumn: params.orderByColumn,
- isAsc: params.isAsc
+ orderByColumn: params.orderByColumn ? params.orderByColumn : "",
+ isAsc: params.isAsc ? params.isAsc : ""
}
})
return res[1].data;
@@ -505,8 +505,8 @@ export default {
header: {
pageNum: params.pageNum,
pageSize: params.pageSize,
- orderByColumn: params.orderByColumn,
- isAsc: params.isAsc
+ orderByColumn: params.orderByColumn ? params.orderByColumn : "",
+ isAsc: params.isAsc ? params.isAsc : ""
}
})
return res[1].data;
@@ -777,5 +777,14 @@ export default {
data: params
})
return res[1].data;
+ },
+
+ async callDetailCustomer(params = {}) {
+ let res = await uni.request({
+ url: '/order/detail/callCustomer',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
}
}
diff --git a/pages/order-manage/modal/time-arrange.vue b/pages/order-manage/modal/time-arrange.vue
index f38f6eb..c10baae 100644
--- a/pages/order-manage/modal/time-arrange.vue
+++ b/pages/order-manage/modal/time-arrange.vue
@@ -162,6 +162,11 @@
id: order.orderMasterId,
isCall: '02'
});
+ } else {
+ this.$request.callDetailCustomer({
+ id: order.orderDetailId,
+ isCall: '02'
+ });
}
uni.makePhoneCall({
phoneNumber: order.customerPhone
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index c79e6bf..f151c6e 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -113,7 +113,9 @@
超时未接单
- 超时未预约
+ 超时未预约
+ 超时未排单
+ 超时未预约
超时未上门
超时未完单
@@ -1076,12 +1078,6 @@
this.ifShowPageMeta = e.show;
},
makePhoneCall(order) {
- if (order.orderDetailId == null) {
- this.$request.callCustomer({
- id: order.orderMasterId,
- isCall: '02'
- });
- }
uni.makePhoneCall({
phoneNumber: order.customerPhone
})
diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue
index 75423d8..edc089d 100644
--- a/pages/order-manage/serv-detail.vue
+++ b/pages/order-manage/serv-detail.vue
@@ -50,7 +50,7 @@
客户:{{servDetail.customerName}}
{{servDetail.customerPhone.substring(0, 3) + "****" + servDetail.customerPhone.substring(7)}}
-
+
@@ -708,6 +708,23 @@
current: e.currentTarget.dataset.url
});
},
+ async makeCustomerPhoneCall(order) {
+ uni.makePhoneCall({
+ phoneNumber: order.customerPhone
+ })
+ if (order.orderDetailId == null) {
+ let res = await this.$request.callCustomer({
+ id: order.orderMasterId,
+ isCall: '02'
+ });
+ } else {
+ this.$request.callDetailCustomer({
+ id: order.orderDetailId,
+ isCall: '02'
+ });
+ }
+ this.loadData();
+ },
makePhoneCall(phoneNum) {
uni.makePhoneCall({
phoneNumber: phoneNum