BUG 27846
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<scroll-view class="fill pendingList" :style="{height: height}" scroll-y>
|
||||
<div class="pendingItem flexRow" flex v-for="op in pending" :key="op.id" @tap="getChild(op)">
|
||||
<div class="pendingItem flex flexRow" v-for="op in pending" :key="op.id" @tap.stop="getChild(op)">
|
||||
<div class="fill" :class="{ self: index == op.id }" v-html="op.name"/>
|
||||
<u-icon v-if="index == op.id" name="checkbox-mark" color="#4181FF"/>
|
||||
</div>
|
||||
@@ -57,7 +57,8 @@ export default {
|
||||
default: false
|
||||
},
|
||||
isForm: Boolean,
|
||||
valueLevel: 5
|
||||
valueLevel: {default: 5},
|
||||
fullName: {default: ''}
|
||||
},
|
||||
computed: {
|
||||
...mapState(['user']),
|
||||
@@ -141,7 +142,7 @@ export default {
|
||||
e && (e.levelLabel = this.levelLabels[e.type])
|
||||
})
|
||||
if (res.data.length > 1) {
|
||||
this.fullArea = res.data.reverse().slice(this.dataRange)
|
||||
this.fullArea = res.data.reverse().slice(this.dataRange - 1)
|
||||
} else {
|
||||
this.fullArea = res.data
|
||||
}
|
||||
@@ -158,10 +159,10 @@ export default {
|
||||
this.list = res.data
|
||||
let self = this.fullArea.find((e) => e.id == this.areaId)
|
||||
if (this.value && !this.areaName && this.value !== this.areaId) {
|
||||
this.areaName = this.list.find((e) => e.id == this.value).name
|
||||
this.areaName = this.list.find((e) => e.id == this.value)?.name
|
||||
}
|
||||
if (!this.areaName && this.value === this.areaId) {
|
||||
this.areaName = self.name
|
||||
this.areaName = self?.name
|
||||
}
|
||||
if (!!self?.id && !this.isHideTown) {
|
||||
this.list.unshift(self)
|
||||
@@ -202,7 +203,10 @@ export default {
|
||||
}
|
||||
},
|
||||
selectNode(area, i) {
|
||||
this.fullArea.splice(i + 1, this.fullArea.length - i)
|
||||
let deleteCount = this.fullArea.length - i
|
||||
if (deleteCount > 0) {
|
||||
this.fullArea.splice(i + 1, deleteCount)
|
||||
}
|
||||
if (this.all && !area.id) {
|
||||
this.index = ''
|
||||
this.getProvinces()
|
||||
@@ -245,7 +249,7 @@ export default {
|
||||
position: relative;
|
||||
|
||||
&:last-of-type {
|
||||
margin-right: 0;
|
||||
margin-right: 0 !important;
|
||||
|
||||
&:after {
|
||||
content: " ";
|
||||
|
||||
Reference in New Issue
Block a user