From 93c824e469dbc5df5bbcbaa77e559c90a0f9df48 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 28 Mar 2023 13:45:17 +0800
Subject: [PATCH] 2023-3-28

---
 src/views/finance/scheduleList.vue           | 8 ++++++--
 src/views/schedule/component/addSchedule.vue | 1 +
 src/views/schedule/component/timeSelect.vue  | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

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 (
+              <div>{row.address || row.customer_address.address}</div>
+            )
+          }
         },
         {
           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 @@
             </el-select>
           </el-form-item>
           <el-form-item label="上门地址选择" prop="address_id">
-            <el-select v-model="form.address_id" placeholder="请选择上门地址选择" style="width: 300px;">
+            <el-select ref="addressSelect" v-model="form.address_id" placeholder="请选择上门地址选择" style="width: 300px;">
               <el-option v-for="(item,index) in addresses" :label="item.address" :value="item.id">
               </el-option>
             </el-select>
@@ -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