|
|
|
|
@ -136,8 +136,6 @@
|
|
|
|
|
@selection="selectionChange" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-text v-if="slotProps.scope.row.resource !=='零担'" |
|
|
|
|
type="primary" |
|
|
|
|
link |
|
|
|
|
@ -152,8 +150,6 @@
|
|
|
|
|
@click="viewStockArticlePackage(slotProps.scope.row)" |
|
|
|
|
>录入数量 |
|
|
|
|
</el-text> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-text |
|
|
|
|
type="primary" |
|
|
|
|
link |
|
|
|
|
@ -315,6 +311,41 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog |
|
|
|
|
v-model="zeroOrderShow" |
|
|
|
|
title="零担订单信息" |
|
|
|
|
width="50%" |
|
|
|
|
:model="zeroOrderData"> |
|
|
|
|
<div v-for="(item,index) in zeroOrderData" :key="index"> |
|
|
|
|
<el-row :gutter="24" class="rows"> |
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>名称：{{item.firsts }} </span> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>总数量：{{item.quantity }} </span> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>在库数量：{{item.handQuantity }} </span> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>出库数量：{{item.outboundQuantity }} </span> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>可用数量：{{(item.handQuantity - item.outboundQuantity)}} </span> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<el-input v-model="zeroPackageNum" placeholder="请输入预约数量"></el-input> |
|
|
|
|
</div> |
|
|
|
|
<el-form-item style="margin-left: 37%; margin-top: 5px"> |
|
|
|
|
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitZeroOrder" |
|
|
|
|
>提交(零担订单) |
|
|
|
|
</el-button |
|
|
|
|
> |
|
|
|
|
<el-button icon="el-icon-circle-close" @click="zeroOrderShow = false">返 回</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
<el-dialog v-model="stockListShow" title="库存品信息" width="100%"> |
|
|
|
|
<!-- :before-close="handleClose"--> |
|
|
|
|
<el-form :inline="true" :model="query"> |
|
|
|
|
@ -535,7 +566,7 @@
|
|
|
|
|
getStockArticleList, |
|
|
|
|
selectStockArticleList, |
|
|
|
|
selectStockArticleInfoList, |
|
|
|
|
selectUpdateAvailableStockArticle |
|
|
|
|
selectUpdateAvailableStockArticle, getZeroOrderDetail |
|
|
|
|
} from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
@ -1686,6 +1717,9 @@
|
|
|
|
|
serveType: [], |
|
|
|
|
//增加订单弹窗 |
|
|
|
|
orderShow: false, |
|
|
|
|
zeroOrderData:[], |
|
|
|
|
zeroOrderShow: false, |
|
|
|
|
zeroPackageNum:0, |
|
|
|
|
//在库订单信息 |
|
|
|
|
stockArticleInfo: [], |
|
|
|
|
//库存品信息 |
|
|
|
|
@ -1939,73 +1973,10 @@
|
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
viewStockArticlePackage(row) { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.packageList = row.packageList; |
|
|
|
|
this.obj = row; |
|
|
|
|
console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row); |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
//这里就是编辑的数据回显问题 |
|
|
|
|
let packageInfo = row.parcelListVOS; |
|
|
|
|
// this.packageData = row.parcelListVOS; |
|
|
|
|
let packageListData = this.packageData; |
|
|
|
|
if (row.packageList.length>0) { |
|
|
|
|
let packageListInfo = row.packageList; |
|
|
|
|
packageInfo.forEach((item, index) => { |
|
|
|
|
packageListInfo.forEach(p => { |
|
|
|
|
if (item.id === p.id) { |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index], true); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
//新增订单，默认全选 |
|
|
|
|
packageInfo.forEach((item, index) => { |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index], true); |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
this.packageData = row.parcelListVOS; |
|
|
|
|
|
|
|
|
|
// 当row内packageList为空时, 默认全选 |
|
|
|
|
if(row.packageList.length === 0) { |
|
|
|
|
this.packageDataSec = row.parcelListVOS |
|
|
|
|
}else{ |
|
|
|
|
this.packageDataSec = row.parcelListVOS.filter(item => { |
|
|
|
|
return row.packageList.some( value => value.id === item.id) |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
this.packageData = row.parcelListVOS; |
|
|
|
|
this.packageDataSec = row.parcelListVOS; |
|
|
|
|
//这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选 |
|
|
|
|
let data = row.parcelListVOS; |
|
|
|
|
data.forEach((item, index) => { |
|
|
|
|
if ( |
|
|
|
|
item.orderPackageReservationStatusName === '已预约' || |
|
|
|
|
item.orderPackageReservationStatus === '20' |
|
|
|
|
) { |
|
|
|
|
// //这里就是表示包件此时状态处于已预约，表示该订单下的这个包件信息被其他的预约信息使用，此时应该处于勾选禁用状态 |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index], true); |
|
|
|
|
}); |
|
|
|
|
// console.log('::', item); |
|
|
|
|
// this.checkPackage(item, index); |
|
|
|
|
} else if ( |
|
|
|
|
item.orderPackageFreezeStatusName !== '已冻结' || |
|
|
|
|
item.orderPackageFreezeStatus !== '20' |
|
|
|
|
) { |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.packageList.toggleRowSelection(this.packageData[index], true); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
this.isaddvalue = true; |
|
|
|
|
this.loading = false; |
|
|
|
|
getZeroOrderDetail(row.id).then(res=>{ |
|
|
|
|
this.zeroOrderData =res.data.data; |
|
|
|
|
}) |
|
|
|
|
this.zeroOrderShow = true; |
|
|
|
|
}, |
|
|
|
|
checkPackage(row, index) { |
|
|
|
|
//区分编辑还是新增 |
|
|
|
|
@ -2293,7 +2264,9 @@
|
|
|
|
|
// this.inventoryList = a; |
|
|
|
|
// } |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
onSubmitZeroOrder(){ |
|
|
|
|
console.log("this.aaa------------->",this.zeroPackageNum); |
|
|
|
|
}, |
|
|
|
|
// 增加库存品 |
|
|
|
|
onSubmitInventory() { |
|
|
|
|
if (this.inventoryList.length === 0) { |
|
|
|
|
|
kilo
1 year ago