Commit fdac78a7 authored by 黄卓's avatar 黄卓

入仓页面缺少标签修改功能 标签箱号回显

https://zentao.jdshangmen.com/bug-view-1846.html
parent 6d967fb2
...@@ -181,6 +181,17 @@ export function orderWarehouseInUpdateLabel(data){ ...@@ -181,6 +181,17 @@ export function orderWarehouseInUpdateLabel(data){
}) })
} }
// 根据订单id获取标签箱号列表
export function getLabelByOrder(orderId){
return request({
url: '/order/order-warehouse-in/get-label-by-order',
method: 'get',
params: {
orderId
}
})
}
// 入仓修改储位 // 入仓修改储位
export function saveOrUpdateOrderLocation(data){ export function saveOrUpdateOrderLocation(data){
return request({ return request({
......
...@@ -102,9 +102,9 @@ ...@@ -102,9 +102,9 @@
<el-button icon="el-icon-minus" circle v-show="index !== 0" @click="label.orderLabelDtoList.splice(index, 1)" style="margin-left: 10px"></el-button> <el-button icon="el-icon-minus" circle v-show="index !== 0" @click="label.orderLabelDtoList.splice(index, 1)" style="margin-left: 10px"></el-button>
<el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button> <el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button>
</div> </div>
<div style="text-align: center"> <!-- <div style="text-align: center">-->
<el-button type="primary" @click="handleLabelSubmit">{{$t('修改箱号')}}</el-button> <!-- <el-button type="primary" @click="handleLabelSubmit">{{$t('修改箱号')}}</el-button>-->
</div> <!-- </div>-->
</el-card> </el-card>
<h2 v-if="orderSpecialNeeds.length > 0">{{$t('特殊需求')}}</h2> <h2 v-if="orderSpecialNeeds.length > 0">{{$t('特殊需求')}}</h2>
...@@ -194,6 +194,7 @@ ...@@ -194,6 +194,7 @@
<script> <script>
import {getCurrencyList} from "@/api/ecw/currency" import {getCurrencyList} from "@/api/ecw/currency"
import { import {
getLabelByOrder,
getOrder, getOrder,
getOrderWarehouseIn, getOrderWarehouseIn,
getSpecialListByOrderId, listByOrderId, getSpecialListByOrderId, listByOrderId,
...@@ -293,13 +294,22 @@ export default { ...@@ -293,13 +294,22 @@ export default {
return arr.indexOf(state) == -1 return arr.indexOf(state) == -1
} }
}, },
handleLabelSubmit(){ // handleLabelSubmit(){
orderWarehouseInUpdateLabel({ // orderWarehouseInUpdateLabel({
...this.label, // ...this.label,
orderId: this.orderId // orderId: this.orderId
}).then(r => { // }).then(r => {
if (r.code === 0){ // if (r.code === 0){
this.$message.success(r.msg || this.$t('修改标签箱号成功')) // this.$message.success(r.msg || this.$t('修改标签箱号成功'))
// }
// })
// },
// 箱号标签回显
getLabelByOrder(){
getLabelByOrder(this.orderId).then(r => {
if (r.code === 0 && !! r.data) {
this.label.orderLabelDtoList = r.data
} }
}) })
}, },
...@@ -323,6 +333,8 @@ export default { ...@@ -323,6 +333,8 @@ export default {
return getOrder(this.orderId).then(r => { return getOrder(this.orderId).then(r => {
this.order = r.data this.order = r.data
this.getTowSum() this.getTowSum()
}).then(() => {
this.getLabelByOrder()
}) })
}, },
specialHas0(){ specialHas0(){
...@@ -353,6 +365,12 @@ export default { ...@@ -353,6 +365,12 @@ export default {
sumVolume: this.form.sumVolume, sumVolume: this.form.sumVolume,
sumWeight: this.form.sumWeight sumWeight: this.form.sumWeight
} }
// 标签箱号
if (this.order.parentOrderId) {
form.labelList = this.label.orderLabelDtoList || []
}
if (this.escapeBol) { if (this.escapeBol) {
form.exceptionUrls = this.form.exceptionUrls.split(','); form.exceptionUrls = this.form.exceptionUrls.split(',');
form.descZh = this.form.descZh; form.descZh = this.form.descZh;
......
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