|
|
@ -108,12 +108,107 @@ |
|
|
min-width="100" |
|
|
min-width="100" |
|
|
label="装托人"> |
|
|
label="装托人"> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="center" |
|
|
|
|
|
min-width="100" |
|
|
|
|
|
label="操作"> |
|
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
<el-link style="cursor: pointer" @click="viewBoxRollDetail(scope.row)">装箱明细</el-link> |
|
|
|
|
|
</template> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
|
</el-table> |
|
|
</el-table> |
|
|
<el-footer style="height:40px;margin-top: 25px;text-align:center"> |
|
|
<el-footer style="height:40px;margin-top: 25px;text-align:center"> |
|
|
<el-button @click="palletModelFlag = false">关闭</el-button> |
|
|
<el-button @click="palletModelFlag = false">关闭</el-button> |
|
|
</el-footer> |
|
|
</el-footer> |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 装箱明细对话框 --> |
|
|
|
|
|
<el-dialog title="装箱明细" :visible.sync="boxRollDetailDialogVisible" width="80%" :close-on-click-modal="false" v-drag> |
|
|
|
|
|
<el-table |
|
|
|
|
|
:data="boxRollDetailList" |
|
|
|
|
|
border |
|
|
|
|
|
height="400" |
|
|
|
|
|
v-loading="boxRollDetailLoading" |
|
|
|
|
|
style="width: 100%;"> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
type="index" |
|
|
|
|
|
label="序号" |
|
|
|
|
|
width="60" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="center"> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
prop="boxNo" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="center" |
|
|
|
|
|
label="箱号" |
|
|
|
|
|
min-width="120"> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
prop="finalRollNo" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="center" |
|
|
|
|
|
label="标签条码" |
|
|
|
|
|
min-width="150"> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
prop="rollQty" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="right" |
|
|
|
|
|
label="标签数量" |
|
|
|
|
|
min-width="100"> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
prop="partNo" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="center" |
|
|
|
|
|
label="物料编码" |
|
|
|
|
|
min-width="120"> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
prop="partDesc" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="left" |
|
|
|
|
|
label="物料名称" |
|
|
|
|
|
min-width="150" |
|
|
|
|
|
show-overflow-tooltip> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
prop="wareHouseId" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="center" |
|
|
|
|
|
label="仓库编码" |
|
|
|
|
|
min-width="100"> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
prop="wareHouseName" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="left" |
|
|
|
|
|
label="仓库名称" |
|
|
|
|
|
min-width="120" |
|
|
|
|
|
show-overflow-tooltip> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
prop="receivedBy" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="center" |
|
|
|
|
|
label="操作员" |
|
|
|
|
|
min-width="100"> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
prop="receivedDate" |
|
|
|
|
|
header-align="center" |
|
|
|
|
|
align="center" |
|
|
|
|
|
label="操作时间" |
|
|
|
|
|
min-width="155"> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
</el-table> |
|
|
|
|
|
<el-footer style="height:40px;margin-top: 25px;text-align:center"> |
|
|
|
|
|
<el-button @click="boxRollDetailDialogVisible = false">关闭</el-button> |
|
|
|
|
|
</el-footer> |
|
|
|
|
|
</el-dialog> |
|
|
</div> |
|
|
</div> |
|
|
</template> |
|
|
</template> |
|
|
|
|
|
|
|
|
@ -126,7 +221,8 @@ import { |
|
|
searchPalletDetail, |
|
|
searchPalletDetail, |
|
|
searchPalletList, |
|
|
searchPalletList, |
|
|
updatePalletStatus, |
|
|
updatePalletStatus, |
|
|
deletePalletBox |
|
|
|
|
|
|
|
|
deletePalletBox, |
|
|
|
|
|
searchBoxRollDetail |
|
|
} from '../../../api/boxManage/boxManage' |
|
|
} from '../../../api/boxManage/boxManage' |
|
|
|
|
|
|
|
|
export default { |
|
|
export default { |
|
|
@ -208,10 +304,10 @@ export default { |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: this.functionId, |
|
|
functionId: this.functionId, |
|
|
serialNumber: '750002Table2BoxesQty', |
|
|
|
|
|
|
|
|
serialNumber: '750002Table2BoxesCount', |
|
|
tableId: "750002Table2", |
|
|
tableId: "750002Table2", |
|
|
tableName: "托清单", |
|
|
tableName: "托清单", |
|
|
columnProp: "xxx", |
|
|
|
|
|
|
|
|
columnProp: "boxesCount", |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "right", |
|
|
align: "right", |
|
|
columnLabel: "装托总数", |
|
|
columnLabel: "装托总数", |
|
|
@ -271,6 +367,10 @@ export default { |
|
|
scanBoxNo:'', |
|
|
scanBoxNo:'', |
|
|
palletModelFlag: false, |
|
|
palletModelFlag: false, |
|
|
palletActionType: 'add', // 新增:添加/删除模式 |
|
|
palletActionType: 'add', // 新增:添加/删除模式 |
|
|
|
|
|
// 装箱明细相关数据 |
|
|
|
|
|
boxRollDetailDialogVisible: false, |
|
|
|
|
|
boxRollDetailList: [], |
|
|
|
|
|
boxRollDetailLoading: false, |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
@ -487,6 +587,31 @@ export default { |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
// 查看装箱明细 |
|
|
|
|
|
viewBoxRollDetail(row){ |
|
|
|
|
|
this.boxRollDetailList = [] |
|
|
|
|
|
this.boxRollDetailDialogVisible = true |
|
|
|
|
|
this.boxRollDetailLoading = true |
|
|
|
|
|
|
|
|
|
|
|
let params = { |
|
|
|
|
|
site: this.palletData.site, |
|
|
|
|
|
buNo: this.palletData.buNo, |
|
|
|
|
|
boxNo: row.boxNo |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
searchBoxRollDetail(params).then(({data}) => { |
|
|
|
|
|
this.boxRollDetailLoading = false |
|
|
|
|
|
if (data && data.code == 0) { |
|
|
|
|
|
this.boxRollDetailList = data.rows || [] |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$message.error(data.msg || '查询装箱明细失败') |
|
|
|
|
|
this.boxRollDetailList = [] |
|
|
|
|
|
} |
|
|
|
|
|
}).catch(() => { |
|
|
|
|
|
this.boxRollDetailLoading = false |
|
|
|
|
|
this.$message.error('查询装箱明细失败') |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
</script> |
|
|
</script> |
|
|
|