Commit 5c7fc1e5 authored by Marcus's avatar Marcus

http://zentao.jdshangmen.com/bug-view-1803.html

一个订单多个商品,后面的商品首次入仓会自动填充前面的品牌  首次入仓箱号默认值
parent 0618530c
...@@ -192,6 +192,17 @@ export function getLabelByOrder(orderId){ ...@@ -192,6 +192,17 @@ export function getLabelByOrder(orderId){
}) })
} }
// 根据订单id获取待入仓标签箱号
export function getLabelWaitInByOrder(orderId){
return request({
url: '/order/order-warehouse-in/get-label-wait-in-by-order',
method: 'get',
params: {
orderId
}
})
}
// 入仓修改储位 // 入仓修改储位
export function saveOrUpdateOrderLocation(data){ export function saveOrUpdateOrderLocation(data){
return request({ return request({
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<script> <script>
import {getCurrencyList} from "@/api/ecw/currency" import {getCurrencyList} from "@/api/ecw/currency"
import { import {
getLabelByOrder, getLabelByOrder, getLabelWaitInByOrder,
getOrder, getOrder,
getOrderWarehouseIn, getOrderWarehouseIn,
getSpecialListByOrderId, listByOrderId, getSpecialListByOrderId, listByOrderId,
...@@ -310,6 +310,14 @@ export default { ...@@ -310,6 +310,14 @@ export default {
getLabelByOrder(this.orderId).then(r => { getLabelByOrder(this.orderId).then(r => {
if (r.code === 0 && !! r.data && r.data.length > 0) { if (r.code === 0 && !! r.data && r.data.length > 0) {
this.label.orderLabelDtoList = r.data this.label.orderLabelDtoList = r.data
} else {
// 没有历史数据,查默认值
getLabelWaitInByOrder(this.orderId).then(r => {
console.log(r)
if (r.code === 0 && !! r.data) {
this.label.orderLabelDtoList = [r.data]
}
})
} }
}) })
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment