Compare commits

..

No commits in common. '9e8b4b3a63e1f352ffe0d4cc8411735cdc5d7d16' and '9b83be310f8b8b93ab4d9318cdcac9c9a1092cd7' have entirely different histories.

  1. 13
      src/views/logisticsManagement/components/detailsLogisticsDialog.vue
  2. 30
      src/views/logisticsManagement/logisticsDistribution.vue

@ -1,7 +1,7 @@
<template> <template>
<el-dialog title="详情" append-to-body :modelValue="openShow" width="70%" @close="closeDialog" :loading="detailsLoading"> <el-dialog title="详情" append-to-body :modelValue="openShow" width="70%" @close="closeDialog">
<el-descriptions title="物料记录"></el-descriptions> <el-descriptions title="物料记录"></el-descriptions>
<el-table :data="yieldOrderList|| []" style="width: 100%"> <el-table :data="detailsInfo.boxbarcodeDetailsVO.yieldOrderList|| []" style="width: 100%">
<el-table-column type="index" width="50" label="序号"> </el-table-column> <el-table-column type="index" width="50" label="序号"> </el-table-column>
<el-table-column prop="cardNo" label="流程卡号" show-overflow-tooltip> </el-table-column> <el-table-column prop="cardNo" label="流程卡号" show-overflow-tooltip> </el-table-column>
<el-table-column prop="yoCode" label="生产单号" show-overflow-tooltip> </el-table-column> <el-table-column prop="yoCode" label="生产单号" show-overflow-tooltip> </el-table-column>
@ -44,8 +44,6 @@ export default {
return { return {
openShow: false, openShow: false,
detailsInfo: {}, detailsInfo: {},
yieldOrderList:[],
detailsLoading:true
}; };
}, },
mounted() { mounted() {
@ -54,16 +52,11 @@ export default {
}, },
methods: { methods: {
async detailsFn() { async detailsFn() {
this.detailsLoading = true;
await taskDetails({ boxBarcode: this.rowItem.boxBarcode, taskId: this.rowItem.id }).then( await taskDetails({ boxBarcode: this.rowItem.boxBarcode, taskId: this.rowItem.id }).then(
res => { res => {
this.detailsLoading = false
this.yieldOrderList = res.data.data.boxbarcodeDetailsVO.yieldOrderList;
this.detailsInfo = res.data.data; this.detailsInfo = res.data.data;
} }
).catch(err => { );
this.detailsLoading = false
})
}, },
closeDialog() { closeDialog() {
this.openShow = false; this.openShow = false;

@ -47,12 +47,7 @@
></receiveDialog> ></receiveDialog>
<!-- 详情 --> <!-- 详情 -->
<detailsLogisticsDialog <detailsLogisticsDialog v-if="detailsLogisticsShow" :showDialog="detailsLogisticsShow" @closeDialog="closeDialog" :rowItem="rowItem"></detailsLogisticsDialog>
v-if="detailsLogisticsShow"
:showDialog="detailsLogisticsShow"
@closeDialog="closeDialog"
:rowItem="rowItem"
></detailsLogisticsDialog>
</basic-container> </basic-container>
</template> </template>
@ -68,7 +63,7 @@ export default {
addLogisticsDialog, addLogisticsDialog,
returnDialog, returnDialog,
receiveDialog, receiveDialog,
detailsLogisticsDialog, detailsLogisticsDialog
}, },
data() { data() {
return { return {
@ -154,6 +149,7 @@ export default {
sortable: true, sortable: true,
span: 12, span: 12,
width: 120, width: 120,
}, },
{ {
label: '起点-区域', label: '起点-区域',
@ -163,13 +159,6 @@ export default {
span: 12, span: 12,
width: 120, width: 120,
searchOrder:17, searchOrder:17,
type: 'select',
filterable: true,
dicUrl: '/blade-desk/station/getStationRegionList?isStart=true',
props: {
label: 'stationRegion',
value: 'stationRegion',
},
}, },
{ {
label: '起点-站点', label: '起点-站点',
@ -206,13 +195,6 @@ export default {
width: 120, width: 120,
hide: true, hide: true,
searchOrder:15, searchOrder:15,
type: 'select',
filterable: true,
dicUrl: '/blade-desk/station/getStationRegionList?isStart=false',
props: {
label: 'stationRegion',
value: 'stationRegion',
},
}, },
{ {
label: '终点-站点', label: '终点-站点',
@ -344,14 +326,14 @@ export default {
this.showReturnDialog = true; this.showReturnDialog = true;
}, },
detailsFn(row){ detailsFn(row){
this.rowItem = row; this.rowItem = row
this.detailsLogisticsShow = true; this.detailsLogisticsShow = true
}, },
closeDialog() { closeDialog() {
this.showAddDialogd = false; this.showAddDialogd = false;
this.showReturnDialog = false; this.showReturnDialog = false;
this.showReceiveDialog = false; this.showReceiveDialog = false;
this.detailsLogisticsShow = false; this.detailsLogisticsShow = false
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}, },
rowSave(row, done, loading) { rowSave(row, done, loading) {

Loading…
Cancel
Save