main
fanfan 3 months ago
parent 75f4e8ecb6
commit b6aef98210
  1. 14
      src/common/model/goods/MultiSpec.js
  2. 1
      src/views/goods/Index.vue
  3. 1
      src/views/market/settle/modules/details.vue

@ -213,25 +213,24 @@ export default class MultiSpec {
this.multiSpecData.skuList = this.oldSkuList(newSkuList) this.multiSpecData.skuList = this.oldSkuList(newSkuList)
} }
// 合并已存在的sku数据 // 合并已存在的sku数据
oldSkuList (newSkuList) { oldSkuList (newSkuList) {
// const oldSkuList = _.cloneDeep(this.multiSpecData.skuList) // const oldSkuList = _.cloneDeep(this.multiSpecData.skuList)
const oldSkuList = this.multiSpecData.skuList.concat() const oldSkuList = this.multiSpecData.skuList.concat()
if (!oldSkuList.length || !newSkuList.length) { if (!oldSkuList.length || !newSkuList.length) {
return newSkuList return newSkuList
} }
console.log(oldSkuList, newSkuList)
for (const index in newSkuList) { for (const index in newSkuList) {
// 查找符合的旧记录 // 查找符合的旧记录
let oldSkuItem = {} let oldSkuItem = {}
// if (oldSkuList.length === newSkuList.length) { // if (oldSkuList.length === newSkuList.length) {
// oldSkuItem = _.cloneDeep(oldSkuList[index]) // oldSkuItem = _.cloneDeep(oldSkuList[index])
// } else { // } else {
oldSkuItem = oldSkuList.find( oldSkuItem = oldSkuList.find(
(item) => (item) =>
newSkuList[index].tempId === newSkuList[index].tempId ===
(item.goods_props && item.goods_props.length > 0) ? item.goods_props.map((v) => v.value.name).join('_') : item.tempId ((item.goods_props && item.goods_props.length > 0) ? item.goods_props.map((v) => v.value.name).join('_') : item.tempId)
) )
// } // }
const item = newSkuList[index] const item = newSkuList[index]
@ -262,7 +261,6 @@ export default class MultiSpec {
} }
return newSkuList return newSkuList
} }
// 生成sku表格字段名 // 生成sku表格字段名
buildSkuColumns (rowSpanArr) { buildSkuColumns (rowSpanArr) {
const specList = this.multiSpecData.specList const specList = this.multiSpecData.specList

@ -236,7 +236,6 @@ const columns = [
width: '90px', width: '90px',
dataIndex: 'spec_type', dataIndex: 'spec_type',
scopedSlots: { customRender: 'spec_type' }, scopedSlots: { customRender: 'spec_type' },
sorter: true,
}, },
{ {
title: '商品价格', title: '商品价格',

@ -210,6 +210,7 @@ export default {
this.visible = true this.visible = true
Api.detail({ id: info }) Api.detail({ id: info })
.then((result) => { .then((result) => {
this.record={}
this.record = result.data.detail this.record = result.data.detail
}) })
.finally(() => (this.isLoading = false)) .finally(() => (this.isLoading = false))

Loading…
Cancel
Save