Commit 46f48388 authored by Marcus's avatar Marcus

【订单管理-入仓】首次入仓操作界面下,订单数据功能未显示

http://zentao.jdshangmen.com/bug-view-440.html
parent 7c23156a
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</el-table> </el-table>
<h2 v-if="orderSpecialNeeds.length > 0">特殊需求</h2> <h2 v-if="orderSpecialNeeds.length > 0">特殊需求</h2>
<el-form ref="form" :model="form" label-width="180px" style="max-width: 600px;"> <el-form ref="form" :model="form" label-width="120px" style="max-width: 500px;">
<el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value"> <el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value">
<el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="'请输入' + item.label"> <el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="'请输入' + item.label">
<el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" placeholder="请选择" slot="append" style="width: 100px"> <el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" placeholder="请选择" slot="append" style="width: 100px">
...@@ -92,6 +92,18 @@ ...@@ -92,6 +92,18 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<h2>订单数据</h2>
<el-form-item label="总方数" style="width: 300px">
<el-input v-model="form.sumVolume" placeholder="请输入总方数">
<span slot="append"></span>
</el-input>
</el-form-item>
<el-form-item label="总方数量" style="width: 300px">
<el-input v-model="form.sumWeight" placeholder="请输入总数量">
<span slot="append">kg</span>
</el-input>
</el-form-item>
<el-card style="margin-top: 15px;"> <el-card style="margin-top: 15px;">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span style="font-size: 18px">入仓影像</span> <span style="font-size: 18px">入仓影像</span>
...@@ -144,19 +156,6 @@ ...@@ -144,19 +156,6 @@
</span> </span>
</el-dialog> </el-dialog>
<!-- <el-dialog-->
<!-- title="转异常单"-->
<!-- :visible.sync="dialogVisible"-->
<!-- width="30%"-->
<!-- :before-close="handleClose(done)"-->
<!-- >-->
<!-- <span>这是一段信息</span>-->
<!-- <span slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="dialogVisible = false">确认并完成入仓</el-button>-->
<!-- <el-button @click="dialogVisible = false">取 消</el-button>-->
<!-- </span>-->
<!-- </el-dialog>-->
<print-tag v-if="isShowPrintTag" :order-id="orderId" @close="isShowPrintTag = false"></print-tag> <print-tag v-if="isShowPrintTag" :order-id="orderId" @close="isShowPrintTag = false"></print-tag>
<print-warehouse-receipt v-if="isShowPrint" :order-id="orderId" @close="isShowPrint = false" /> <print-warehouse-receipt v-if="isShowPrint" :order-id="orderId" @close="isShowPrint = false" />
...@@ -197,7 +196,7 @@ export default { ...@@ -197,7 +196,7 @@ export default {
mounted() { mounted() {
if(this.$route.query.id){ if(this.$route.query.id){
this.orderId = parseInt(this.$route.query.id || undefined) this.orderId = parseInt(this.$route.query.id || undefined)
getOrder(this.orderId).then(r => this.order = r.data) this.getOrder()
getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse()) getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data) getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
listByOrderId({ orderId: this.orderId }).then(r => this.form.orderLocationCreateReqVOList = r.data) listByOrderId({ orderId: this.orderId }).then(r => this.form.orderLocationCreateReqVOList = r.data)
...@@ -218,7 +217,9 @@ export default { ...@@ -218,7 +217,9 @@ export default {
exceptionUrls:[], exceptionUrls:[],
descZh:'', descZh:'',
manualExceptionType:'', manualExceptionType:'',
urls: [] urls: [],
sumVolume: '',
sumWeight: '',
}, },
currencyList:[], currencyList:[],
order: {}, order: {},
...@@ -233,6 +234,22 @@ export default { ...@@ -233,6 +234,22 @@ export default {
}, },
methods: { methods: {
getTowSum(){
let sumVolume = 0
let sumWeight = 0
this.order.orderItemVOList.forEach(e => {
if (e?.warehouseInInfoVO?.volume) sumVolume += e.warehouseInInfoVO.volume
if (e?.warehouseInInfoVO?.weight) sumWeight += e.warehouseInInfoVO.weight
})
this.form.sumVolume = sumVolume
this.form.sumWeight = sumWeight
},
getOrder(){
getOrder(this.orderId).then(r => {
this.order = r.data
this.getTowSum()
})
},
handleSubmit() { handleSubmit() {
let p = { let p = {
orderSpecialNeedReceivableReqVoList: this.form.orderSpecialNeedReceivableReqVoList, orderSpecialNeedReceivableReqVoList: this.form.orderSpecialNeedReceivableReqVoList,
...@@ -284,7 +301,7 @@ export default { ...@@ -284,7 +301,7 @@ export default {
}); });
getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse()) getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
getOrder(this.orderId).then(r => this.order = r.data) this.getOrder()
}) })
}).catch(() => { }).catch(() => {
...@@ -295,7 +312,7 @@ export default { ...@@ -295,7 +312,7 @@ export default {
watch: { watch: {
warehousingVisible(val) { warehousingVisible(val) {
if (!val){ if (!val){
getOrder(this.orderId).then(r => this.order = r.data) this.getOrder()
getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse()) getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
} }
}, },
......
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