This commit is contained in:
aihe 2024-04-29 10:37:22 +08:00
parent 71f048ac5e
commit 70fd6fda1b
3 changed files with 22 additions and 5 deletions

View File

@ -171,7 +171,7 @@
return this.$store.getters.dicData
},
goodsSearchParam() {
return { goodsName: this.modelInfo.goodsName }
return { goodsName: this.modelInfo.goodsName || '' }
}
},
watch: {

View File

@ -1,5 +1,5 @@
<template>
<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" style="height: 100%;">
<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" :style="customStyle">
<slot></slot>
<!-- 加载更多 -->
@ -41,6 +41,15 @@
deep: true
}
},
computed: {
customStyle() {
let stl = `height: 100%;`
if(this.maxHeight) {
stl += `max-height:${this.maxHeight}rpx;`
}
return stl
}
},
props: {
searchParam: {
default () {
@ -73,6 +82,11 @@
default () {
return 'dfl'
}
},
maxHeight: {
default () {
return ''
}
}
},
data() {

View File

@ -19,7 +19,7 @@
</view>
<view v-if="mode == modeEnum.drop && show" class="md-drop-cont">
<tpx-scroll-view :resObject="filResObject" :searchParam="searchParam" :getListFun="getListFun" size="sm" :showLoadedAll="false" @onListChange="onListChange">
<tpx-scroll-view :maxHeight="dropMaxHeight" :resObject="filResObject" :searchParam="searchParam" :getListFun="getListFun" size="sm" :showLoadedAll="false" @onListChange="onListChange">
<content-items :value="value" :list="filDataList" :minChecked="minChecked" :type="type"
@onChange="handleDataItemChange"
></content-items>
@ -97,6 +97,11 @@
return ""
}
},
dropMaxHeight: {
default () {
return 600
}
},
list: {
default () {
return []
@ -174,8 +179,6 @@
top: calc(100% + 8px);
left: 0;
right: 0;
max-height: 600rpx;
overflow: auto;
z-index: 10;
padding: 20rpx;
box-sizing: border-box;