diff --git a/src/components/Modal/GoodsModal/GoodsModal.vue b/src/components/Modal/GoodsModal/GoodsModal.vue index 52573cf..7634abe 100644 --- a/src/components/Modal/GoodsModal/GoodsModal.vue +++ b/src/components/Modal/GoodsModal/GoodsModal.vue @@ -53,7 +53,7 @@ /> - {{ text}} + {{ text }} @@ -112,6 +112,7 @@ export default { maxNum: PropTypes.integer.def(100), // 默认选中的列表记录 defaultList: PropTypes.array.def([]), + channel:PropTypes.any }, components: { STable, @@ -128,11 +129,15 @@ export default { // 当前表单元素 searchForm: this.$form.createForm(this), // 查询参数 - queryParam: {}, + queryParam: { + is_sale: 1, + is_pool: 1, + }, // table表头 columns, // 加载数据方法 必须为 Promise 对象 loadData: (param) => { + this.queryParam.channel = this.channel return GoodsApi.list({ ...param, ...this.queryParam }).then((response) => { return response.data.list }) diff --git a/src/components/SelectGoods/SelectGoods.vue b/src/components/SelectGoods/SelectGoods.vue index 1cfff62..011adb1 100644 --- a/src/components/SelectGoods/SelectGoods.vue +++ b/src/components/SelectGoods/SelectGoods.vue @@ -6,6 +6,7 @@ :multiple="multiple" :maxNum="maxNum" :defaultList="selectedItems" + :channel="channel" @handleSubmit="handleSelectGoodsSubmit" /> @@ -53,7 +54,8 @@ export default { // 最大选择的数量限制, multiple模式下有效 maxNum: PropTypes.integer.def(100), // 默认选中的商品 - defaultList: PropTypes.array.def([]) + defaultList: PropTypes.array.def([]), + channel:PropTypes.any }, data () { return { diff --git a/src/views/dataCenter/goods/modules/MultiSpec.vue b/src/views/dataCenter/goods/modules/MultiSpec.vue index 11b75ce..059cf57 100644 --- a/src/views/dataCenter/goods/modules/MultiSpec.vue +++ b/src/views/dataCenter/goods/modules/MultiSpec.vue @@ -95,7 +95,7 @@ bordered >