main^2
fanfan 6 months ago
parent 40d92f28f6
commit 59d093c54e
  1. 4
      src/components/Modal/GoodsModal/GoodsModal.vue
  2. 4
      src/components/SelectGoods/SelectGoods.vue
  3. 5
      src/views/dataCenter/goods/modules/MultiSpec.vue
  4. 1
      src/views/dataCenter/goods/modules/Update.vue

@ -112,7 +112,8 @@ export default {
maxNum: PropTypes.integer.def(100), maxNum: PropTypes.integer.def(100),
// //
defaultList: PropTypes.array.def([]), defaultList: PropTypes.array.def([]),
channel:PropTypes.any channel: PropTypes.any,
source: PropTypes.any.def(0),
}, },
components: { components: {
STable, STable,
@ -138,6 +139,7 @@ export default {
// Promise // Promise
loadData: (param) => { loadData: (param) => {
this.queryParam.channel = this.channel this.queryParam.channel = this.channel
this.queryParam = this.source == 1 ? this.queryParam : {}
return GoodsApi.list({ ...param, ...this.queryParam }).then((response) => { return GoodsApi.list({ ...param, ...this.queryParam }).then((response) => {
return response.data.list return response.data.list
}) })

@ -7,6 +7,7 @@
:maxNum="maxNum" :maxNum="maxNum"
:defaultList="selectedItems" :defaultList="selectedItems"
:channel="channel" :channel="channel"
:source="source"
@handleSubmit="handleSelectGoodsSubmit" @handleSubmit="handleSelectGoodsSubmit"
/> />
</div> </div>
@ -55,7 +56,8 @@ export default {
maxNum: PropTypes.integer.def(100), maxNum: PropTypes.integer.def(100),
// //
defaultList: PropTypes.array.def([]), defaultList: PropTypes.array.def([]),
channel:PropTypes.any channel:PropTypes.any,
source: PropTypes.any.def(0),
}, },
data () { data () {
return { return {

@ -95,7 +95,7 @@
bordered bordered
> >
<template slot="select_goods" slot-scope="text, item"> <template slot="select_goods" slot-scope="text, item">
<SelectGoods :multiple="false" :channel="channel" @change="handleSelectGoods($event, item)" /> <SelectGoods :multiple="false" :source='source' :channel="channel" @change="handleSelectGoods($event, item)" />
</template> </template>
<!-- 商品名称 --> <!-- 商品名称 -->
<!-- <template slot="goods_name" slot-scope="text, item"> <!-- <template slot="goods_name" slot-scope="text, item">
@ -156,7 +156,8 @@ export default {
// () // ()
isSpecLocked: PropTypes.bool.def(false), isSpecLocked: PropTypes.bool.def(false),
checkList: PropTypes.array.def([]), checkList: PropTypes.array.def([]),
channel:PropTypes.any channel:PropTypes.any,
source: PropTypes.any.def(0),
}, },
data () { data () {
return { return {

@ -154,6 +154,7 @@
:defaultSkuList="formData.goods.skuList" :defaultSkuList="formData.goods.skuList"
:channel="formData.goods.channel" :channel="formData.goods.channel"
:checkList="checkList" :checkList="checkList"
:source="1"
/> />
</div> </div>
<!-- 单规格的表单内容 --> <!-- 单规格的表单内容 -->

Loading…
Cancel
Save