diff --git a/pages/enterAndExit/exit/add.vue b/pages/enterAndExit/exit/add.vue index 48e3af7..7ed1372 100644 --- a/pages/enterAndExit/exit/add.vue +++ b/pages/enterAndExit/exit/add.vue @@ -1,705 +1,687 @@ diff --git a/pages/enterAndExit/exit/selectGoods.vue b/pages/enterAndExit/exit/selectGoods.vue index 7a2a28b..c5c2fbe 100644 --- a/pages/enterAndExit/exit/selectGoods.vue +++ b/pages/enterAndExit/exit/selectGoods.vue @@ -8,7 +8,8 @@ @iconClick="search" @keyup.enter.native="search"> - + 货品编码 @@ -69,6 +70,7 @@ export default { onLoad(options) { console.log('options:', options) this.form = options.form ? JSON.parse(decodeURIComponent(options.form)) : this.form + this.selectList = options.selectList ? JSON.parse(decodeURIComponent(options.selectList)) : [] console.log('form:', this.form) this.getList() }, @@ -114,9 +116,21 @@ export default { this.tableList.map(item => { if (item.materialId === selectItem.materialId) { item.checked = true + item.fetchNum = selectItem.fetchNum } }) }) + this.$nextTick(() => { + if (this.$refs.uniTable) { + this.tableList.forEach((item, index) => { + if (item.checked) { + this.$refs.uniTable.toggleRowSelection(index, true) + } + }) + } else { + console.warn('uniTable未挂载或setSelection方法不存在') + } + }) this.status = this.total == this.tableList.length ? 'nomore' : 'loadmore' } catch (error) { console.log(error) diff --git a/pages/enterAndExit/goods/index.vue b/pages/enterAndExit/goods/index.vue index 3de3d5e..cd95a2f 100644 --- a/pages/enterAndExit/goods/index.vue +++ b/pages/enterAndExit/goods/index.vue @@ -38,7 +38,7 @@ export default { searchValue: '', tableList: [], pageNum: 1, - pageSize: 10, + pageSize: 100, total: 0, status: 'loadmore', } @@ -85,8 +85,8 @@ export default { } }, handleImage(item) { - if (item.materialImage) { - return item.materialImage + if (item.imgUrl) { + return item.imgUrl } else { return '/static/images/handheld/ic_goods_img.jpg' }