BUG 28418

This commit is contained in:
aixianling
2022-03-22 10:17:51 +08:00
parent a93b30a565
commit bc7161c806
6 changed files with 14 additions and 25 deletions

View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="wrapper"> <div class="wrapper">
<div class="searAreName"> <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"> <div class="ai-area__wrapper">
<span class="label" v-if="areaName">{{ areaName }}</span> <span class="label" v-if="areaName">{{ areaName }}</span>
<span v-else>请选择</span> <span v-else>请选择</span>

View File

@@ -32,7 +32,7 @@
<div class="card"> <div class="card">
<view class="item" :class="{spb:!row.topLabel,flex:!row.topLabel}" v-for="row in contract" :key="row.prop"> <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"/> <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"/> <u-icon name="arrow-right" :label="form.currentAreaName||'请选择'" label-pos="left" color="#ddd"/>
</AiAreaPicker> </AiAreaPicker>
<textarea v-else v-model="form[row.prop]" input-align="right" placeholder="请输入" placeholder-style="color:#999" <textarea v-else v-model="form[row.prop]" input-align="right" placeholder="请输入" placeholder-style="color:#999"
@@ -42,10 +42,8 @@
<div class="card"> <div class="card">
<view class="item" :class="{spb:!row.topLabel,flex:!row.topLabel}" v-for="row in household" :key="row.prop"> <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"/> <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)" <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"> :fullName.sync="form.householdAreaName" valueLevel="5" isForm/>
<u-icon name="arrow-right" :label="form.householdAreaName||'请选择'" label-pos="left" color="#ddd"/>
</AiAreaPicker>
<textarea v-else v-model="form[row.prop]" input-align="right" placeholder="请输入" placeholder-style="color:#999" <textarea v-else v-model="form[row.prop]" input-align="right" placeholder="请输入" placeholder-style="color:#999"
maxlength="50"/> maxlength="50"/>
</view> </view>
@@ -55,7 +53,7 @@
<span class="label" :class="{required:row.required}" v-text="row.label"/> <span class="label" :class="{required:row.required}" v-text="row.label"/>
<AiSelect v-if="row.dict" v-model="form[row.prop]" :dict="row.dict"/> <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]"/> <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"> :fullName.sync="form.birthplaceAreaName">
<u-icon name="arrow-right" :label="form.birthplaceAreaName||'请选择'" label-pos="left" color="#ddd"/> <u-icon name="arrow-right" :label="form.birthplaceAreaName||'请选择'" label-pos="left" color="#ddd"/>
</AiAreaPicker> </AiAreaPicker>
@@ -82,7 +80,7 @@ export default {
data() { data() {
let required = true let required = true
return { return {
ownerOps:[], ownerOps: [],
form: { form: {
householdName: "1", householdName: "1",
currentAreaName: "", currentAreaName: "",
@@ -117,7 +115,7 @@ export default {
} }
}, },
onLoad() { onLoad() {
this.$dict.load("yesOrNo", "householdRelation").then(()=>{ this.$dict.load("yesOrNo", "householdRelation").then(() => {
this.ownerOps = this.$dict.getDict("yesOrNo") this.ownerOps = this.$dict.getDict("yesOrNo")
}) })
this.getResident() this.getResident()

View File

@@ -1,8 +1,7 @@
<template> <template>
<div class="wrapper" v-if="pageShow"> <div class="wrapper" v-if="pageShow">
<div class="area"> <div class="area">
<AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" <AiAreaPicker v-model="areaId" :name.sync="areaName" :areaId="$areaId" @input="handleSelect">
@select="handleSelect">
<div class="ai-area__wrapper"> <div class="ai-area__wrapper">
<span class="label" v-if="areaName">{{ areaName }}</span> <span class="label" v-if="areaName">{{ areaName }}</span>
<span v-else>请选择</span> <span v-else>请选择</span>
@@ -72,11 +71,9 @@ export default {
}) })
} }
}, },
handleSelect(val) { handleSelect() {
this.$loading() this.$loading()
this.areaId = val
this.current = 1 this.current = 1
this.$nextTick(() => { this.$nextTick(() => {
this.getList() this.getList()
}) })

View File

@@ -1,7 +1,7 @@
<template> <template>
<section class="videoSurveillance"> <section class="videoSurveillance">
<div class="area-content"> <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"> <div class="ai-area__wrapper">
<u-icon name="arrow-down" color="#666" size="24" :label="areaName||'请选择'" label-pos="left" label-size="40"/> <u-icon name="arrow-down" color="#666" size="24" :label="areaName||'请选择'" label-pos="left" label-size="40"/>
</div> </div>

View File

@@ -41,8 +41,7 @@
<h2>上报地区</h2> <h2>上报地区</h2>
</div> </div>
<div class="form-item__right"> <div class="form-item__right">
<AiAreaPicker ref="area" class="ai-area" :value="form.areaId" :areaId="$areaId" <AiAreaPicker class="ai-area" :areaId="$areaId" v-model="form.areaId" :fullName.sync="form.areaName">
:fullName.sync="form.areaName" mode="custom" @select="v => form.areaId = v">
<div class="ai-area__wrapper"> <div class="ai-area__wrapper">
<span class="label" v-if="form.areaName">{{ form.areaName }}</span> <span class="label" v-if="form.areaName">{{ form.areaName }}</span>
<i v-else>请选择</i> <i v-else>请选择</i>
@@ -75,7 +74,7 @@
import {mapState} from 'vuex' import {mapState} from 'vuex'
export default { export default {
appName:"添加上报人员", appName: "添加上报人员",
data() { data() {
return { return {
form: { form: {

View File

@@ -83,7 +83,7 @@
<h2>出发地区</h2> <h2>出发地区</h2>
</div> </div>
<div class="form-item__right"> <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"> <div class="ai-area__wrapper">
<span class="label" v-if="form.startAreaName">{{ form.startAreaName }}</span> <span class="label" v-if="form.startAreaName">{{ form.startAreaName }}</span>
<i v-else>请选择</i> <i v-else>请选择</i>
@@ -129,12 +129,7 @@
<h2>到达地区</h2> <h2>到达地区</h2>
</div> </div>
<div class="form-item__right"> <div class="form-item__right">
<AiAreaPicker <AiAreaPicker class="ai-area" v-model="form.arriveAreaId" :fullName.sync="form.arriveAreaName" :areaId="$areaId">
ref="area"
class="ai-area"
v-model="form.arriveAreaId"
:fullName.sync="form.arriveAreaName"
:areaId="$areaId">
<div class="ai-area__wrapper"> <div class="ai-area__wrapper">
<span class="label" v-if="form.arriveAreaName">{{ form.arriveAreaName }}</span> <span class="label" v-if="form.arriveAreaName">{{ form.arriveAreaName }}</span>
<i v-else>请选择</i> <i v-else>请选择</i>