From bc7161c806c7cc8495dc90f8441a4d1fb2682fab Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 22 Mar 2022 10:17:51 +0800
Subject: [PATCH] BUG 28418

---
 src/mods/AppAddressBook/AppAddressBook.vue     |  2 +-
 src/mods/AppAuth/authApply.vue                 | 14 ++++++--------
 src/mods/AppPolice/AppPolice.vue               |  7 ++-----
 src/mods/AppVideoSurve/AppVideoSurve.vue       |  2 +-
 src/mods/service/AppHealthReport/AddUser.vue   |  5 ++---
 src/mods/service/AppReturnHomeRegister/Add.vue |  9 ++-------
 6 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/mods/AppAddressBook/AppAddressBook.vue b/src/mods/AppAddressBook/AppAddressBook.vue
index 31457ac..ff0f62c 100644
--- a/src/mods/AppAddressBook/AppAddressBook.vue
+++ b/src/mods/AppAddressBook/AppAddressBook.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrapper">
     <div class="searAreName">
-      <AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" @select="areaSelect" >
+      <AiAreaPicker ref="area" class="ai-area" v-model="areaId" :name.sync="areaName" :areaId="$areaId" @input="areaSelect" >
         <div class="ai-area__wrapper">
           <span class="label" v-if="areaName">{{ areaName }}</span>
           <span v-else>请选择</span>
diff --git a/src/mods/AppAuth/authApply.vue b/src/mods/AppAuth/authApply.vue
index addd2ae..089d5f3 100644
--- a/src/mods/AppAuth/authApply.vue
+++ b/src/mods/AppAuth/authApply.vue
@@ -32,7 +32,7 @@
     <div class="card">
       <view class="item" :class="{spb:!row.topLabel,flex:!row.topLabel}" v-for="row in contract" :key="row.prop">
         <span class="label" :class="{required:row.required}" v-text="row.label"/>
-        <AiAreaPicker v-if="row.type=='area'" @select="v=>$set(form,row.prop,v)" :fullName.sync="form.currentAreaName">
+        <AiAreaPicker v-if="row.type=='area'" @input="v=>$set(form,row.prop,v)" :fullName.sync="form.currentAreaName">
           <u-icon name="arrow-right" :label="form.currentAreaName||'请选择'" label-pos="left" color="#ddd"/>
         </AiAreaPicker>
         <textarea v-else v-model="form[row.prop]" input-align="right" placeholder="请输入" placeholder-style="color:#999"
@@ -42,10 +42,8 @@
     <div class="card">
       <view class="item" :class="{spb:!row.topLabel,flex:!row.topLabel}" v-for="row in household" :key="row.prop">
         <span class="label" :class="{required:row.required}" v-text="row.label"/>
-        <AiAreaPicker v-if="row.prop=='householdAreaId'" all @select="v=>$set(form,row.prop,v)"
-                      :fullName.sync="form.householdAreaName" valueLevel="5">
-          <u-icon name="arrow-right" :label="form.householdAreaName||'请选择'" label-pos="left" color="#ddd"/>
-        </AiAreaPicker>
+        <AiAreaPicker v-if="row.prop=='householdAreaId'" all @input="v=>$set(form,row.prop,v)" v-model="form[row.prop]"
+                      :fullName.sync="form.householdAreaName" valueLevel="5" isForm/>
         <textarea v-else v-model="form[row.prop]" input-align="right" placeholder="请输入" placeholder-style="color:#999"
                   maxlength="50"/>
       </view>
@@ -55,7 +53,7 @@
         <span class="label" :class="{required:row.required}" v-text="row.label"/>
         <AiSelect v-if="row.dict" v-model="form[row.prop]" :dict="row.dict"/>
         <AiDate v-else-if="row.type=='time'" v-model="form[row.prop]"/>
-        <AiAreaPicker v-else-if="row.type=='area'" @select="v=>$set(form,row.prop,v)" all
+        <AiAreaPicker v-else-if="row.type=='area'" all v-model="form[row.prop]"
                       :fullName.sync="form.birthplaceAreaName">
           <u-icon name="arrow-right" :label="form.birthplaceAreaName||'请选择'" label-pos="left" color="#ddd"/>
         </AiAreaPicker>
@@ -82,7 +80,7 @@ export default {
   data() {
     let required = true
     return {
-      ownerOps:[],
+      ownerOps: [],
       form: {
         householdName: "1",
         currentAreaName: "",
@@ -117,7 +115,7 @@ export default {
     }
   },
   onLoad() {
-    this.$dict.load("yesOrNo", "householdRelation").then(()=>{
+    this.$dict.load("yesOrNo", "householdRelation").then(() => {
       this.ownerOps = this.$dict.getDict("yesOrNo")
     })
     this.getResident()
diff --git a/src/mods/AppPolice/AppPolice.vue b/src/mods/AppPolice/AppPolice.vue
index ebc7147..d684b7e 100644
--- a/src/mods/AppPolice/AppPolice.vue
+++ b/src/mods/AppPolice/AppPolice.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="wrapper" v-if="pageShow">
     <div class="area">
-      <AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId"
-                      @select="handleSelect">
+      <AiAreaPicker v-model="areaId" :name.sync="areaName" :areaId="$areaId" @input="handleSelect">
         <div class="ai-area__wrapper">
           <span class="label" v-if="areaName">{{ areaName }}</span>
           <span v-else>请选择</span>
@@ -72,11 +71,9 @@ export default {
         })
       }
     },
-    handleSelect(val) {
+    handleSelect() {
       this.$loading()
-      this.areaId = val
       this.current = 1
-
       this.$nextTick(() => {
         this.getList()
       })
diff --git a/src/mods/AppVideoSurve/AppVideoSurve.vue b/src/mods/AppVideoSurve/AppVideoSurve.vue
index 6256c35..38ecfab 100644
--- a/src/mods/AppVideoSurve/AppVideoSurve.vue
+++ b/src/mods/AppVideoSurve/AppVideoSurve.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="videoSurveillance">
     <div class="area-content">
-      <AiAreaPicker class="ai-area" :name.sync="areaName" @select="areaSelect">
+      <AiAreaPicker class="ai-area" :name.sync="areaName" @input="areaSelect">
         <div class="ai-area__wrapper">
           <u-icon name="arrow-down" color="#666" size="24" :label="areaName||'请选择'" label-pos="left" label-size="40"/>
         </div>
diff --git a/src/mods/service/AppHealthReport/AddUser.vue b/src/mods/service/AppHealthReport/AddUser.vue
index 2f78982..a3ee64a 100644
--- a/src/mods/service/AppHealthReport/AddUser.vue
+++ b/src/mods/service/AppHealthReport/AddUser.vue
@@ -41,8 +41,7 @@
             <h2>上报地区</h2>
           </div>
           <div class="form-item__right">
-            <AiAreaPicker ref="area" class="ai-area" :value="form.areaId" :areaId="$areaId"
-                          :fullName.sync="form.areaName" mode="custom" @select="v => form.areaId = v">
+            <AiAreaPicker class="ai-area" :areaId="$areaId" v-model="form.areaId" :fullName.sync="form.areaName">
               <div class="ai-area__wrapper">
                 <span class="label" v-if="form.areaName">{{ form.areaName }}</span>
                 <i v-else>请选择</i>
@@ -75,7 +74,7 @@
 import {mapState} from 'vuex'
 
 export default {
-  appName:"添加上报人员",
+  appName: "添加上报人员",
   data() {
     return {
       form: {
diff --git a/src/mods/service/AppReturnHomeRegister/Add.vue b/src/mods/service/AppReturnHomeRegister/Add.vue
index 0c0c428..6195b4d 100644
--- a/src/mods/service/AppReturnHomeRegister/Add.vue
+++ b/src/mods/service/AppReturnHomeRegister/Add.vue
@@ -83,7 +83,7 @@
             <h2>出发地区</h2>
           </div>
           <div class="form-item__right">
-            <AiAreaPicker ref="area" class="ai-area" v-model="form.startAreaId" :fullName.sync="form.startAreaName" all>
+            <AiAreaPicker class="ai-area" v-model="form.startAreaId" :fullName.sync="form.startAreaName" all>
               <div class="ai-area__wrapper">
                 <span class="label" v-if="form.startAreaName">{{ form.startAreaName }}</span>
                 <i v-else>请选择</i>
@@ -129,12 +129,7 @@
             <h2>到达地区</h2>
           </div>
           <div class="form-item__right">
-            <AiAreaPicker
-                ref="area"
-                class="ai-area"
-                v-model="form.arriveAreaId"
-                :fullName.sync="form.arriveAreaName"
-                :areaId="$areaId">
+            <AiAreaPicker class="ai-area" v-model="form.arriveAreaId" :fullName.sync="form.arriveAreaName" :areaId="$areaId">
               <div class="ai-area__wrapper">
                 <span class="label" v-if="form.arriveAreaName">{{ form.arriveAreaName }}</span>
                 <i v-else>请选择</i>