java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

自提增加详情信息

dev-xx
马远东 10 months ago
parent
0f52fd34a4
commit
ad9929c872
2 changed files with 122 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 140
      src/views/distribution/inventory/distrilbutionBillLading.vue
  2. 37
      src/views/distribution/inventory/distrilbutionBillLadingView.vue

140
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -668,6 +668,7 @@ export default {
PackageCheckList:[],//包件勾选的数据 PackageCheckList:[],//包件勾选的数据
tabletit: '', //记录当前点击的标题栏 tabletit: '', //记录当前点击的标题栏
multifunctional: '', //编辑订单搜索 multifunctional: '', //编辑订单搜索
PackageState:[],//包件字典
dialogImg: false, dialogImg: false,
Imgurl: undefined, Imgurl: undefined,
Selfpickuploading: false, //页面加载 Selfpickuploading: false, //页面加载
@ -1753,7 +1754,7 @@ export default {
{ {
label: '创建时间', label: '创建时间',
prop: 'createTime', prop: 'createTime',
type: 4, type: 1,
values: '', values: '',
width: '180', width: '180',
checkarr: [], checkarr: [],
@ -1764,7 +1765,7 @@ export default {
{ {
label: '仓库', label: '仓库',
prop: 'warehouse', prop: 'warehouse',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1775,7 +1776,7 @@ export default {
{ {
label: '包条码', label: '包条码',
prop: 'orderPackageCode', prop: 'orderPackageCode',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1786,7 +1787,7 @@ export default {
{ {
label: '货位信息', label: '货位信息',
prop: 'goodsAllocation', prop: 'goodsAllocation',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1797,7 +1798,7 @@ export default {
{ {
label: '所在托盘', label: '所在托盘',
prop: 'pallet', prop: 'pallet',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1805,10 +1806,22 @@ export default {
sortable: true, sortable: true,
head: false, head: false,
}, },
{
label: '包件状态',
prop: 'orderPackageStatus',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{ {
label: '一级品', label: '一级品',
prop: 'firsts', prop: 'firsts',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1819,7 +1832,7 @@ export default {
{ {
label: '二级品', label: '二级品',
prop: 'second', prop: 'second',
type: 2, type:1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1830,7 +1843,7 @@ export default {
{ {
label: '三级品', label: '三级品',
prop: 'thirdProduct', prop: 'thirdProduct',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1841,7 +1854,7 @@ export default {
{ {
label: '物料', label: '物料',
prop: 'materialName', prop: 'materialName',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1863,7 +1876,7 @@ export default {
{ {
label: '车次号', label: '车次号',
prop: 'trainNumber', prop: 'trainNumber',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -2453,6 +2466,16 @@ export default {
console.log('res :>> ', res); console.log('res :>> ', res);
console.log(res.data.data.records, '获取到的包件'); console.log(res.data.data.records, '获取到的包件');
const data = res.data.data; const data = res.data.data;
if(res.data.code ==200){
if(res.data && res.data.data.records?.length){
console.log(this.PackageState,'包件状态');
res.data.data.records.forEach(item=>{
if(item.orderPackageStatus){
item.orderPackageStatus= this.PackageState.find(res=>res.dictKey == item.orderPackageStatus).dictValue
}
})
}
}
this.order.total = data.total; this.order.total = data.total;
this.order.orderDetails = data.records; this.order.orderDetails = data.records;
const _node = await document.querySelector('.orderChooseTable'); const _node = await document.querySelector('.orderChooseTable');
@ -2462,15 +2485,15 @@ export default {
console.log(this.order.orderDetails,'当前列表的参数'); console.log(this.order.orderDetails,'当前列表的参数');
console.log(this.PackageCheckList,'当前勾选参数集合【去重过】'); console.log(this.PackageCheckList,'当前勾选参数集合【去重过】');
//全部勾选的数据 //全部勾选的数据
let uncheckedIds = this.Unchecked.map(item => item.id); let uncheckedIds = this.Unchecked.map(item => item.id);
// 过滤掉 _aa 中未勾选的项 // 过滤掉 _aa 中未勾选的项
this.PackageCheckList = this.PackageCheckList.filter(a => !uncheckedIds.includes(a.id)); this.PackageCheckList = this.PackageCheckList.filter(a => !uncheckedIds.includes(a.id));
let _check =await this.order.orderDetails.filter(({ id }) => new Set(this.PackageCheckList.map(({ id }) => id)).has(id)); let _check =await this.order.orderDetails.filter(({ id }) => new Set(this.PackageCheckList.map(({ id }) => id)).has(id));
console.log(this.order.selectList,'当前勾选的LIST'); console.log(this.order.selectList,'当前勾选的LIST');
console.log(this.order.orderDetails,'当前获得数据LIST'); console.log(this.order.orderDetails,'当前获得数据LIST');
console.log(this.PackageCheckList,'所有勾选的LIST'); console.log(this.PackageCheckList,'所有勾选的LIST');
console.log(_check,'筛选出来的参数'); console.log(_check,'筛选出来的参数');
if(_check.length){ if(_check.length){
this.$refs.orderChooseTable.handleCheckSelect(_check); this.$refs.orderChooseTable.handleCheckSelect(_check);
}else{ }else{
this.$refs.orderChooseTable.handleCheckSelect(data.records); this.$refs.orderChooseTable.handleCheckSelect(data.records);
@ -2507,9 +2530,20 @@ console.log(_check,'筛选出来的参数');
...params, ...params,
...this.order.query, ...this.order.query,
}).then(async res => { }).then(async res => {
console.log(res,'当前包件列表');
if(res.data.code !=200){ if(res.data.code !=200){
return return
} }
if(res.data.code ==200){
if(res.data && res.data.data.records?.length){
console.log(this.PackageState,'包件状态');
res.data.data.records.forEach(item=>{
if(item.orderPackageStatus){
item.orderPackageStatus= this.PackageState.find(res=>res.dictKey == item.orderPackageStatus).dictValue
}
})
}
}
console.log('res :>> ', res); console.log('res :>> ', res);
const data = res.data.data; const data = res.data.data;
this.order.total = data.total || 0; this.order.total = data.total || 0;
@ -2533,14 +2567,10 @@ console.log(_check,'筛选出来的参数');
let matchedItems = this.order.orderDetails.filter(item => _dataList.includes(item.id)); let matchedItems = this.order.orderDetails.filter(item => _dataList.includes(item.id));
this.$refs.orderChooseTable.handleCheckSelect(matchedItems); this.$refs.orderChooseTable.handleCheckSelect(matchedItems);
} }
// 深拷贝数据 // 深拷贝数据
console.log('this.order.selectList :>> ', this.order.selectList); console.log('this.order.selectList :>> ', this.order.selectList);
row.originalList = JSON.parse(JSON.stringify(this.order.selectList)); row.originalList = JSON.parse(JSON.stringify(this.order.selectList));
this.order.orderChooseLoading = false; this.order.orderChooseLoading = false;
}).catch((error)=>{ }).catch((error)=>{
console.log(error,'error'); console.log(error,'error');
this.order.orderChooseLoading = false; this.order.orderChooseLoading = false;
@ -2589,35 +2619,35 @@ console.log(_check,'筛选出来的参数');
console.log(this.CheckId,'原本数据'); console.log(this.CheckId,'原本数据');
console.log(this.order.selectList,'当前勾选的数据'); console.log(this.order.selectList,'当前勾选的数据');
console.log(this.order.orderDetails,'全部数据'); console.log(this.order.orderDetails,'全部数据');
// 找出新增数据对象 // 找出新增数据对象
let addedData = this.order.selectList.filter(item => !this.CheckId.includes(item.id)); let addedData = this.order.selectList.filter(item => !this.CheckId.includes(item.id));
let addedObjects = this.order.orderDetails.filter(item => addedData.map(data => data.id).includes(item.id)); let addedObjects = this.order.orderDetails.filter(item => addedData.map(data => data.id).includes(item.id));
if(addedObjects && addedObjects.length){ if(addedObjects && addedObjects.length){
this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList=[] this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList=[]
this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = addedObjects.map(item => { this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = addedObjects.map(item => {
return { return {
parceListId: item.id, parceListId: item.id,
stockArticleId: item.stockArticleId, stockArticleId: item.stockArticleId,
packetBarCode: item.orderPackageCode, packetBarCode: item.orderPackageCode,
}; };
}); });
} }
// 找出删除数据对象 // 找出删除数据对象
let deletedData = this.CheckId.filter(id => !this.order.selectList.find(item => item.id === id)); let deletedData = this.CheckId.filter(id => !this.order.selectList.find(item => item.id === id));
let deletedObjects = this.order.orderDetails.filter(item => deletedData.includes(item.id)); let deletedObjects = this.order.orderDetails.filter(item => deletedData.includes(item.id));
if(deletedObjects && deletedObjects.length){ if(deletedObjects && deletedObjects.length){
this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList=[] this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList=[]
this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList = deletedObjects.map(item => { this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList = deletedObjects.map(item => {
return { return {
parceListId: item.id, parceListId: item.id,
stockArticleId: item.stockArticleId, stockArticleId: item.stockArticleId,
packetBarCode: item.orderPackageCode, packetBarCode: item.orderPackageCode,
}; };
}); });
} }
console.log('新增的数据对象:', addedObjects); console.log('新增的数据对象:', addedObjects);
console.log('删除的数据对象:', deletedObjects); console.log('删除的数据对象:', deletedObjects);
this.dialogChooseOrderVisible = false; this.dialogChooseOrderVisible = false;
console.log( this.dataList.find(val => val.id === this.orderChooseId),' this.dataList.find(val => val.id === this.orderChooseId)筛选出来的'); console.log( this.dataList.find(val => val.id === this.orderChooseId),' this.dataList.find(val => val.id === this.orderChooseId)筛选出来的');
@ -2710,6 +2740,14 @@ console.log('删除的数据对象:', deletedObjects);
//单位 //单位
this.logpmUnit = res.data.data; this.logpmUnit = res.data.data;
}); });
// 包件状态
getDictionaryBiz('order_package_status').then(res => {
//单位
console.log(res,'包件状态');
if(res.data.code == 200){
this.PackageState = res.data.data || [];
}
});
getDictionaryBiz('order_status').then(res => { getDictionaryBiz('order_status').then(res => {
this.deliveryOrderStatus = res.data.data; this.deliveryOrderStatus = res.data.data;
this.$functions.checkcColumnList('orderStatusName', this.columnList).checkarr = this.$functions.checkcColumnList('orderStatusName', this.columnList).checkarr =

37
src/views/distribution/inventory/distrilbutionBillLadingView.vue
Unescape View File

@ -14,16 +14,16 @@
<el-col :xl="7" :lg="7" :md="8" :sm="24"> <el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>服务号：{{ data.serviceNumber }} </span> <span>服务号：{{ data.serviceNumber }} </span>
</el-col> </el-col>
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24"> <el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>运单号：{{ data.waybillNumber }} </span> <span>运单号：{{ data.waybillNumber }} </span>
</el-col> </el-col>
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24"> <el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>收货单位：{{ data.consigneeUnit }} </span> <span>收货单位：{{ data.consigneeUnit }} </span>
</el-col> </el-col>
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24"> <el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>收货人：{{ data.customerName }} </span> <span>收货人：{{ data.customerName }} </span>
</el-col> </el-col>
@ -33,6 +33,35 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<!-- <span>{{deliverydata.loadingTeamType}} </span> -->
<span>计划件数： {{ data.planNum}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>实提件数：{{ data.realNum }} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<!-- <span>{{deliverydata.loadingTeamType}} </span> -->
<span>签收人： {{ data.signforUserName || '暂无'}} </span>
</el-col>
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<!-- <span>{{deliverydata.loadingTeamType}} </span> -->
<span>审核人： {{ data.examineUserName || '暂无' }} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>审核时间：{{ data.examineTime || '暂无'}} </span>
</el-col>
</el-row>
<el-divider>签收图片</el-divider> <el-divider>签收图片</el-divider>
<div class="siginImg_container"> <div class="siginImg_container">

Write Preview
Loading…
Cancel
Save