Commit 5b75cc29 authored by xiaoyan's avatar xiaoyan

fix: 关联单明细

parent a12ddae7
...@@ -47,7 +47,9 @@ ...@@ -47,7 +47,9 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="sumNum"> <el-table-column :label="$t('箱数')" align="center" prop="sumNum">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.sumNum }}<span v-if="scope.row.mixStatus === 1">{{$t('混箱')}}</span> <el-link type="primary">
{{ scope.row.sumNum }}<span v-if="scope.row.mixStatus === 1">{{$t('混箱')}}</span>
</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('纸箱尺寸')" align="center"> <el-table-column :label="$t('纸箱尺寸')" align="center">
...@@ -82,19 +84,30 @@ ...@@ -82,19 +84,30 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" /> <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
</el-row> </el-row>
</el-row> </el-row>
<warehouse-detail :orderId="showWarehouseInItemId" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
<realated-order :orderItemId="showRelatedItemId" v-if="showRelatedItemId" @close="showRelatedItemId=null"></realated-order>
</div> </div>
</template> </template>
<script> <script>
import { getUnPkgPage, createPkgOrder, createBatchPkgOrder } from '@/api/ecw/boxAir' import { getUnPkgPage, createPkgOrder, createBatchPkgOrder } from '@/api/ecw/boxAir'
import { formatDate, serviceMsg } from '../../utils' import { formatDate, serviceMsg } from '../../utils'
import WarehouseDetail from "../../../shippingSea/nodePage/tally/warehouseDetail";
import RealatedOrder from "../../../shippingSea/nodePage/tally/realatedOrder.vue";
import {getOrder} from "@/api/ecw/order";
export default { export default {
components: {
WarehouseDetail,
RealatedOrder,
},
props: { props: {
pkgData: Object, pkgData: Object,
shipmentObj: Object, shipmentObj: Object,
}, },
data() { data() {
return { return {
showWarehouseInItemId: null,
showRelatedItemId: null,
pagList: [], pagList: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
...@@ -113,7 +126,11 @@ export default { ...@@ -113,7 +126,11 @@ export default {
methods: { methods: {
getList() { getList() {
getUnPkgPage(this.queryParams).then((res) => { getUnPkgPage(this.queryParams).then((res) => {
let list = [];
this.pagList = res.data.list || [] this.pagList = res.data.list || []
res.data.forEach((item) => {
})
this.total = res.data.total this.total = res.data.total
}) })
}, },
...@@ -136,6 +153,17 @@ export default { ...@@ -136,6 +153,17 @@ export default {
}) })
return data.toString() return data.toString()
}, },
// 显示入仓记录
showWarehouseLogs(row) {
getOrder(row.orderId).then((response) => {
this.order = response.data;
this.showWarehouseInItemId = row.orderId;
});
},
// 显示关联单
showRelatedOrder(row) {
this.showRelatedItemId = row.orderId
},
addPkg(row) { addPkg(row) {
let data = { let data = {
pkgId: this.pkgData.id, pkgId: this.pkgData.id,
......
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