From 54724aecb5d0b0c049a6331126741ae947d76fb3 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 27 Dec 2024 15:34:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E5=9C=B0=E5=9B=BE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/schedule/index.js                    |  8 ++++++++
 src/components/villagePick/index.vue         | 14 +++++++++++++-
 src/views/customer/component/addCustomer.vue |  3 +--
 src/views/customer/customer.vue              |  2 +-
 src/views/customer/map.vue                   |  1 -
 src/views/schedule/map.vue                   | 20 +++++++++++++++-----
 src/views/schedule/workerSchedule.vue        |  2 +-
 7 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/api/schedule/index.js b/src/api/schedule/index.js
index 46edc1a..229cf5b 100644
--- a/src/api/schedule/index.js
+++ b/src/api/schedule/index.js
@@ -66,6 +66,14 @@ export function scheduleIndex(params){
   })
 }
 
+export function scheduleIndexSimple(params) {
+  return request({
+    method:'get',
+    url:'/api/admin/schedule/schedule-index-simple',
+    params
+  })
+}
+
 export function nurseSchedule(params){
   return request(
     {
diff --git a/src/components/villagePick/index.vue b/src/components/villagePick/index.vue
index 1584f8b..40257f8 100644
--- a/src/components/villagePick/index.vue
+++ b/src/components/villagePick/index.vue
@@ -25,7 +25,11 @@ export default {
       type: Number,
       default: 5
     },
-    value: [Number,String]
+    value: [Number,String],
+    propsValue: {
+      type: String,
+      default: 'code'
+    }
   },
   data() {
     return {
@@ -60,6 +64,14 @@ export default {
   computed: {
     ...mapGetters(['village_codes']),
   },
+  watch: {
+    propsValue: {
+      handler: function(newVal) {
+        this.props.value = newVal
+      },
+      immediate: true
+    }
+  }
 }
 </script>
 
diff --git a/src/views/customer/component/addCustomer.vue b/src/views/customer/component/addCustomer.vue
index 1ad742e..3fd1022 100644
--- a/src/views/customer/component/addCustomer.vue
+++ b/src/views/customer/component/addCustomer.vue
@@ -198,7 +198,6 @@
             <el-select
               value-key="id"
               :value="pickedProduct.name"
-              v-load-more="productLoad"
               placeholder="请选择产品"
               style="width: 400px"
               @change="productPick">
@@ -524,7 +523,7 @@ export default {
       ageTemp:false,
       productSelect: {
         page: 1,
-        page_size: 10
+        page_size: 999
       },
       pickerOptions: {
         shortcuts: [{
diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index dee40f0..35de40e 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -90,7 +90,7 @@
               </Button>
               <Button type="primary" style="margin-left: 10px" @click="exportExcel(new Date().getTime())">导出</Button>
 
-              <!--              <Button type="primary" style="margin-left: 10px" @click="$refs['imports'].show()">导入长护险用户</Button>-->
+              <Button type="primary" style="margin-left: 10px" @click="$refs['imports'].show()">导入长护险用户</Button>
             </div>
           </slot>
         </lx-header>
diff --git a/src/views/customer/map.vue b/src/views/customer/map.vue
index 1f02ef5..bd95ba7 100644
--- a/src/views/customer/map.vue
+++ b/src/views/customer/map.vue
@@ -130,7 +130,6 @@ export default {
       }
 
       this.areas = city.detail
-      console.log(1111,this.areas)
 
       this.areas.forEach(item1 => {
         //this.areaMap.set(item1.id,item1.remark)
diff --git a/src/views/schedule/map.vue b/src/views/schedule/map.vue
index 711cab1..98ddb33 100644
--- a/src/views/schedule/map.vue
+++ b/src/views/schedule/map.vue
@@ -24,7 +24,7 @@
               size="small"
               style="width: 234px; margin-right: 10px"
               type="daterange"
-              @change="e => { if(e[0]&&e[1]){selected.start_date = e[0];selected.end_date = e[1]}else{selected.start_date = '';selected.end_date = ''} }"></el-date-picker>
+              @input="e => {if(e[0]&&e[1]) {selected.start_date = e[0];selected.end_date = e[1]}else{selected.start_date = '';selected.end_date = ''} }"></el-date-picker>
             <Button style="margin-right: 10px" type="primary" @click="search">查询</Button>
           </div>
           <slot>
@@ -76,7 +76,7 @@
             </div>
             <div>
               <i class="el-icon-location" style="padding-right: 10px;"></i>
-              {{ select.address.address }}
+              {{ select.info.customer_address ? select.info.customer_address.address : '' }}
             </div>
           </div>
         </div>
@@ -87,7 +87,7 @@
 
 <script>
 import { AMapManager,lazyAMapApiLoaderInstance } from 'vue-amap'
-import { scheduleIndex } from '@/api/schedule'
+import { scheduleIndexSimple } from '@/api/schedule'
 import { getAgeByIdcard } from '@/utils'
 
 const amapManager = new AMapManager()
@@ -120,7 +120,7 @@ export default {
 
     async getList(){
       console.log(this.selected)
-      let res = await scheduleIndex(this.selected)
+      let res = await scheduleIndexSimple(this.selected)
       this.lists = res.map(item => {
         let address = item.customer?.customer_address?.filter(item1 => item1.id === item.address_id)[0]
         return {
@@ -160,7 +160,17 @@ export default {
         let marker = new AMap.Marker({
           draggable:false,
           cursor:'pointer',
-          position:[Number(i.address?.lng || 0),Number(i.address?.lat || 0)],
+          position: (() => {
+            if (i.info.status === 0) {
+              return [Number(i.info?.customer_address?.lng || 0),Number(i.info?.customer_address?.lat || 0)]
+            } else if (i.info.status === 1) {
+              let loc = i.info.logs.find(j => j.type === 1)
+              return loc ? [Number(loc.lng??0),Number(loc.lat??0)] : []
+            } else if (i.info.status === 2) {
+              let loc = i.info.logs.find(j => j.type === 3)
+              return loc ? [Number(loc.lng??0),Number(loc.lat??0)] : []
+            }
+          })(),
           icon:map.get(i.info.status),
           label: {content:i.info.nurse?.name,offset:new AMap.Pixel(0,28)},
           clickable:true,
diff --git a/src/views/schedule/workerSchedule.vue b/src/views/schedule/workerSchedule.vue
index 4cf6e8d..36fcbdd 100644
--- a/src/views/schedule/workerSchedule.vue
+++ b/src/views/schedule/workerSchedule.vue
@@ -207,7 +207,7 @@
                   :ref="`el-pop-${scope.row.id}`"
                   placement="top"
                   width="200">
-                  <p>确认要删除排版?</p>
+                  <p>确认要删除排班?</p>
                   <div style="text-align: right; margin: 0">
                     <el-button size="mini" type="text" @click="$refs[`el-pop-${scope.row.id}`].doClose()">取消</el-button>
                     <el-button type="primary" size="mini" @click="deleteSchedule(scope.row)">确定</el-button>