|
@@ -918,6 +918,9 @@ export default {
|
|
918
|
const latestOrder = (res.code === 200 && res.data) ? res.data : null
|
918
|
const latestOrder = (res.code === 200 && res.data) ? res.data : null
|
|
919
|
if (latestOrder) {
|
919
|
if (latestOrder) {
|
|
920
|
this.$emit('update-order-detail', latestOrder)
|
920
|
this.$emit('update-order-detail', latestOrder)
|
|
|
|
921
|
+ this._latestOrderForWarehouse = latestOrder
|
|
|
|
922
|
+ } else {
|
|
|
|
923
|
+ this._latestOrderForWarehouse = null
|
|
921
|
}
|
924
|
}
|
|
922
|
const orderToCheck = latestOrder || this.orderDetail
|
925
|
const orderToCheck = latestOrder || this.orderDetail
|
|
923
|
if (orderToCheck.status != '3') {
|
926
|
if (orderToCheck.status != '3') {
|
|
@@ -987,6 +990,8 @@ export default {
|
|
987
|
actualPrice: this.currentReceipt.sellingPrice || '',//实价,也就是顶部的第三个价格sellingPrice
|
990
|
actualPrice: this.currentReceipt.sellingPrice || '',//实价,也就是顶部的第三个价格sellingPrice
|
|
988
|
price: this.currentReceipt.sellingPrice || '',//官方指导价,也就是顶部的第三个价格sellingPrice
|
991
|
price: this.currentReceipt.sellingPrice || '',//官方指导价,也就是顶部的第三个价格sellingPrice
|
|
989
|
model: this.warehouseInfo.model || '',//型号
|
992
|
model: this.warehouseInfo.model || '',//型号
|
|
|
|
993
|
+ recyclePerson: (this._latestOrderForWarehouse && this._latestOrderForWarehouse.receiptNickName != null) ? this._latestOrderForWarehouse.receiptNickName : (this.warehouseInfo.recyclePerson || ''),//回收人员:使用接口返回的收单人员姓名
|
|
|
|
994
|
+ recyclePersonId: (this._latestOrderForWarehouse && this._latestOrderForWarehouse.receiptUserId != null) ? this._latestOrderForWarehouse.receiptUserId : (this.warehouseInfo.recyclePersonId || ''),//回收人员id:使用接口返回的收单人员id
|
|
990
|
}
|
995
|
}
|
|
991
|
if (!this.currentReceipt.warehouseId) {
|
996
|
if (!this.currentReceipt.warehouseId) {
|
|
992
|
//当没有仓库id的时候调用新增仓库接口
|
997
|
//当没有仓库id的时候调用新增仓库接口
|