diff --git a/src/views/finance/scheduleList.vue b/src/views/finance/scheduleList.vue
index f5f4d8b..0b65e99 100644
--- a/src/views/finance/scheduleList.vue
+++ b/src/views/finance/scheduleList.vue
@@ -273,10 +273,14 @@ export default {
width: 180
},
{
- prop:'customer_address.address',
label:'上门地址',
minWidth:220,
- align:'left'
+ align:'left',
+ customFn:row => {
+ return (
+
{row.address || row.customer_address.address}
+ )
+ }
},
{
width: 140,
diff --git a/src/views/schedule/component/addSchedule.vue b/src/views/schedule/component/addSchedule.vue
index 580f92c..3dcd816 100644
--- a/src/views/schedule/component/addSchedule.vue
+++ b/src/views/schedule/component/addSchedule.vue
@@ -183,6 +183,7 @@ export default {
if(type === 2){
this.$refs['timeSelect'].isDelete = schedule.status == 0
this.$refs['timeSelect'].form.id = schedule.id
+ this.$refs['timeSelect'].form.nurse_id = schedule.nurse_id
this.$refs['timeSelect'].form.start_time = schedule.start_time
this.$refs['timeSelect'].form.end_time = schedule.end_time
this.$refs['timeSelect'].form.schedule_list_skus = schedule.sku.map(item => item.sku_id)
diff --git a/src/views/schedule/component/timeSelect.vue b/src/views/schedule/component/timeSelect.vue
index c072659..e16859e 100644
--- a/src/views/schedule/component/timeSelect.vue
+++ b/src/views/schedule/component/timeSelect.vue
@@ -41,7 +41,7 @@
-
+
@@ -128,6 +128,7 @@ export default {
order_id: '',
nurse_id: '',
address_id:'',
+ address: '',
start_time: '',
end_time: '',
schedule_list_skus: []
@@ -249,6 +250,7 @@ export default {
submit() {
if(this.flag){
+ this.form.address = this.$refs['addressSelect'].selectedLabel
this.form.customer_id = this.customerId
this.form.product_id = this.productId
this.form.order_id = this.orderId