|
|
@ -712,7 +712,7 @@ |
|
|
this.carList1 = this.carList1 |
|
|
this.carList1 = this.carList1 |
|
|
} |
|
|
} |
|
|
// const uuid = generateUUID(); |
|
|
// const uuid = generateUUID(); |
|
|
// console.log('uuid',uuid); |
|
|
|
|
|
this.handleData() |
|
|
this.handleData() |
|
|
}, |
|
|
}, |
|
|
filters: { |
|
|
filters: { |
|
|
@ -735,7 +735,7 @@ |
|
|
methods: { |
|
|
methods: { |
|
|
handleData(){ |
|
|
handleData(){ |
|
|
let that = this; |
|
|
let that = this; |
|
|
console.log('出加载',this.carList1) |
|
|
|
|
|
for (let i = 0; i < this.carList1.length; i++) { |
|
|
for (let i = 0; i < this.carList1.length; i++) { |
|
|
|
|
|
|
|
|
if (this.carList1[i].saleDetailQueryDTO) { |
|
|
if (this.carList1[i].saleDetailQueryDTO) { |
|
|
@ -766,7 +766,7 @@ |
|
|
productNum:this.carList1[i].saleDetailQueryDTO[m].productNum != undefined?this.carList1[i].saleDetailQueryDTO[m].productNum : this.carList1[i].saleDetailQueryDTO[m].stockCount, |
|
|
productNum:this.carList1[i].saleDetailQueryDTO[m].productNum != undefined?this.carList1[i].saleDetailQueryDTO[m].productNum : this.carList1[i].saleDetailQueryDTO[m].stockCount, |
|
|
uuid:'A'+generateUUID() |
|
|
uuid:'A'+generateUUID() |
|
|
} |
|
|
} |
|
|
console.log('data1',this.carList1[i].saleDetailQueryDTO[m].productNum); |
|
|
|
|
|
obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1) |
|
|
obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1) |
|
|
obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount |
|
|
obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount |
|
|
} |
|
|
} |
|
|
@ -889,9 +889,9 @@ |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
invenRadio(){ |
|
|
invenRadio(){ |
|
|
console.log('isInventory',this.isInventory) |
|
|
|
|
|
this.isInventory = !this.isInventory |
|
|
this.isInventory = !this.isInventory |
|
|
// console.log(e) |
|
|
|
|
|
}, |
|
|
}, |
|
|
AiHandleData(){ |
|
|
AiHandleData(){ |
|
|
let that = this; |
|
|
let that = this; |
|
|
@ -933,7 +933,7 @@ |
|
|
} else { //当前页有数据 |
|
|
} else { //当前页有数据 |
|
|
if (this.carList.has(this.carList1[i].productId) == true) { //商品相同 |
|
|
if (this.carList.has(this.carList1[i].productId) == true) { //商品相同 |
|
|
for (let m = 0; m < this.carList1[i].stockLogList1.length; m++) { |
|
|
for (let m = 0; m < this.carList1[i].stockLogList1.length; m++) { |
|
|
console.log('stockLogList1',this.carList1[i].stockLogList1[m]) |
|
|
|
|
|
if (this.carList.get(this.carList1[i].productId).stockLogList.has(this.carList1[i] |
|
|
if (this.carList.get(this.carList1[i].productId).stockLogList.has(this.carList1[i] |
|
|
.stockLogList1[ |
|
|
.stockLogList1[ |
|
|
m].attributeList) == true) { //规格相同 |
|
|
m].attributeList) == true) { //规格相同 |
|
|
@ -1133,14 +1133,14 @@ |
|
|
}else{ |
|
|
}else{ |
|
|
that.currentAnchor = '#'+value.uuid; |
|
|
that.currentAnchor = '#'+value.uuid; |
|
|
} |
|
|
} |
|
|
console.log(that.currentAnchor) |
|
|
|
|
|
}, 200) |
|
|
}, 200) |
|
|
}) |
|
|
}) |
|
|
that.$nextTick(()=>{ |
|
|
that.$nextTick(()=>{ |
|
|
setTimeout(res => { |
|
|
setTimeout(res => { |
|
|
that.currentAnchor = "" |
|
|
that.currentAnchor = "" |
|
|
similar = '' |
|
|
similar = '' |
|
|
console.log(that.currentAnchor) |
|
|
|
|
|
}, 1000) |
|
|
}, 1000) |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
@ -1452,7 +1452,7 @@ |
|
|
this.noList.push(res.result.data[i].productName+'-'+ res.result.data[i].stockLogList1[m].attributeList) |
|
|
this.noList.push(res.result.data[i].productName+'-'+ res.result.data[i].stockLogList1[m].attributeList) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
console.log(res.result.data[i].productCount) |
|
|
|
|
|
res.result.data[i].stockLogList1 = newList |
|
|
res.result.data[i].stockLogList1 = newList |
|
|
if(newList.length > 0){ |
|
|
if(newList.length > 0){ |
|
|
newData.push(res.result.data[i]) |
|
|
newData.push(res.result.data[i]) |
|
|
@ -1463,7 +1463,7 @@ |
|
|
}else{ |
|
|
}else{ |
|
|
this.carList1 = res.result.data |
|
|
this.carList1 = res.result.data |
|
|
} |
|
|
} |
|
|
console.log(this.noList); |
|
|
|
|
|
if(this.noList !='' || res.result.aiNotRecognition !=''){ |
|
|
if(this.noList !='' || res.result.aiNotRecognition !=''){ |
|
|
this.$refs.AiNoPopup.open() |
|
|
this.$refs.AiNoPopup.open() |
|
|
} |
|
|
} |
|
|
@ -1560,7 +1560,7 @@ |
|
|
this.priceType = e |
|
|
this.priceType = e |
|
|
that.priceCurrent = index |
|
|
that.priceCurrent = index |
|
|
this.carList.forEach(function(value, key) { |
|
|
this.carList.forEach(function(value, key) { |
|
|
console.log('麻烦',value) |
|
|
|
|
|
|
|
|
|
|
|
that.index = value.productId || value.id |
|
|
that.index = value.productId || value.id |
|
|
|
|
|
|
|
|
@ -1579,14 +1579,14 @@ |
|
|
}, |
|
|
}, |
|
|
//商品上选择是零售价还是批发价 |
|
|
//商品上选择是零售价还是批发价 |
|
|
checkPay(price) { |
|
|
checkPay(price) { |
|
|
console.log(price) |
|
|
|
|
|
if (price == undefined || price == null) { |
|
|
if (price == undefined || price == null) { |
|
|
this.tui.toast("暂无拿货记录") |
|
|
this.tui.toast("暂无拿货记录") |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
let that = this; |
|
|
let that = this; |
|
|
let num = this.carList.get(this.index) |
|
|
let num = this.carList.get(this.index) |
|
|
// console.log(num) |
|
|
|
|
|
num.discountAmount = price |
|
|
num.discountAmount = price |
|
|
num.unitPrice = price; |
|
|
num.unitPrice = price; |
|
|
num.price = price * num.productCount; |
|
|
num.price = price * num.productCount; |
|
|
@ -1693,7 +1693,7 @@ |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
that.$nextTick(() => { |
|
|
that.$nextTick(() => { |
|
|
console.log('oldTemList', that.oldTemList) |
|
|
|
|
|
console.log('temporaryList', that.temporaryList) |
|
|
console.log('temporaryList', that.temporaryList) |
|
|
console.log('pageOldTemList', that.pageOldTemList) |
|
|
console.log('pageOldTemList', that.pageOldTemList) |
|
|
}) |
|
|
}) |
|
|
|
wangfukang
3 years ago