|
|
|
|
@ -135,6 +135,7 @@
|
|
|
|
|
<el-row> |
|
|
|
|
<el-form-item label="发货单位:" prop="shipper"> |
|
|
|
|
<SelectBox |
|
|
|
|
:focus="handleCloseSelcet" |
|
|
|
|
:input="() => handleFindClientInfo('shipper', 1)" |
|
|
|
|
v-model="query.shipper" |
|
|
|
|
placeholder="发货单位" |
|
|
|
|
@ -144,7 +145,7 @@
|
|
|
|
|
:data="details.shipperOptions" |
|
|
|
|
style="width: 100%" |
|
|
|
|
@row-click="handleChooseShipper" |
|
|
|
|
:loading="details.loadingObj.consignerLoading" |
|
|
|
|
v-loading="details.loadingObj.consignerLoading" |
|
|
|
|
> |
|
|
|
|
<el-table-column prop="clientName" label="发货单位" width="130" /> |
|
|
|
|
<el-table-column prop="linkMan" label="发货人" width="130" /> |
|
|
|
|
@ -156,6 +157,7 @@
|
|
|
|
|
|
|
|
|
|
<el-form-item label="发货人:" prop="shipperName"> |
|
|
|
|
<SelectBox |
|
|
|
|
:focus="handleCloseSelcet" |
|
|
|
|
:input="() => handleFindClientInfo('shipper')" |
|
|
|
|
v-model="query.shipperName" |
|
|
|
|
placeholder="发货人" |
|
|
|
|
@ -165,7 +167,7 @@
|
|
|
|
|
:data="details.shipperOptions" |
|
|
|
|
style="width: 100%" |
|
|
|
|
@row-click="handleChooseShipper" |
|
|
|
|
:loading="details.loadingObj.consignerLoading" |
|
|
|
|
v-loading="details.loadingObj.consignerLoading" |
|
|
|
|
> |
|
|
|
|
<el-table-column prop="clientName" label="发货单位" width="130" /> |
|
|
|
|
<el-table-column prop="linkMan" label="发货人" width="130" /> |
|
|
|
|
@ -179,6 +181,7 @@
|
|
|
|
|
<el-row> |
|
|
|
|
<el-form-item label="联系电话:" prop="shipperMobile"> |
|
|
|
|
<SelectBox |
|
|
|
|
:focus="handleCloseSelcet" |
|
|
|
|
:input="() => handleFindClientInfo('shipper')" |
|
|
|
|
v-model="query.shipperMobile" |
|
|
|
|
placeholder="联系电话" |
|
|
|
|
@ -188,7 +191,7 @@
|
|
|
|
|
:data="details.shipperOptions" |
|
|
|
|
style="width: 100%" |
|
|
|
|
@row-click="handleChooseShipper" |
|
|
|
|
:loading="details.loadingObj.consignerLoading" |
|
|
|
|
v-loading="details.loadingObj.consignerLoading" |
|
|
|
|
> |
|
|
|
|
<el-table-column prop="clientName" label="发货单位" width="130" /> |
|
|
|
|
<el-table-column prop="linkMan" label="发货人" width="130" /> |
|
|
|
|
@ -216,6 +219,7 @@
|
|
|
|
|
<el-row> |
|
|
|
|
<el-form-item label="收货单位:" prop="consignee"> |
|
|
|
|
<SelectBox |
|
|
|
|
:focus="handleCloseSelcet" |
|
|
|
|
:input="() => handleFindClientInfo('consignee', 1)" |
|
|
|
|
v-model="query.consignee" |
|
|
|
|
placeholder="收货人" |
|
|
|
|
@ -225,7 +229,7 @@
|
|
|
|
|
:data="details.consignerOptions" |
|
|
|
|
style="width: 100%" |
|
|
|
|
@row-click="handleChooseConsigner" |
|
|
|
|
:loading="details.loadingObj.consignerLoading" |
|
|
|
|
v-loading="details.loadingObj.consignerLoading" |
|
|
|
|
> |
|
|
|
|
<el-table-column prop="clientName" label="收货单位" width="130" /> |
|
|
|
|
<el-table-column prop="linkMan" label="收货人" width="130" /> |
|
|
|
|
@ -237,6 +241,7 @@
|
|
|
|
|
|
|
|
|
|
<el-form-item label="收货人:" prop="consigneeName"> |
|
|
|
|
<SelectBox |
|
|
|
|
:focus="handleCloseSelcet" |
|
|
|
|
:input="() => handleFindClientInfo('consignee')" |
|
|
|
|
v-model="query.consigneeName" |
|
|
|
|
placeholder="收货人" |
|
|
|
|
@ -246,7 +251,7 @@
|
|
|
|
|
:data="details.consignerOptions" |
|
|
|
|
style="width: 100%" |
|
|
|
|
@row-click="handleChooseConsigner" |
|
|
|
|
:loading="details.loadingObj.consignerLoading" |
|
|
|
|
v-loading="details.loadingObj.consignerLoading" |
|
|
|
|
> |
|
|
|
|
<el-table-column prop="clientName" label="收货单位" width="130" /> |
|
|
|
|
<el-table-column prop="linkMan" label="收货人" width="130" /> |
|
|
|
|
@ -260,6 +265,7 @@
|
|
|
|
|
<el-row> |
|
|
|
|
<el-form-item label="联系电话:" prop="consigneeMobile"> |
|
|
|
|
<SelectBox |
|
|
|
|
:focus="handleCloseSelcet" |
|
|
|
|
:input="() => handleFindClientInfo('consignee')" |
|
|
|
|
v-model="query.consigneeMobile" |
|
|
|
|
placeholder="联系电话" |
|
|
|
|
@ -269,7 +275,7 @@
|
|
|
|
|
:data="details.consignerOptions" |
|
|
|
|
style="width: 100%" |
|
|
|
|
@row-click="handleChooseConsigner" |
|
|
|
|
:loading="details.loadingObj.consignerLoading" |
|
|
|
|
v-loading="details.loadingObj.consignerLoading" |
|
|
|
|
> |
|
|
|
|
<el-table-column prop="clientName" label="收货单位" width="130" /> |
|
|
|
|
<el-table-column prop="linkMan" label="收货人" width="130" /> |
|
|
|
|
@ -346,8 +352,35 @@
|
|
|
|
|
prop="goodsName" |
|
|
|
|
class="el-times" |
|
|
|
|
> |
|
|
|
|
<SelectBox className="goodsName" v-model="item.goodsName" placeholder="货物名称"> |
|
|
|
|
暂无数据 |
|
|
|
|
<SelectBox |
|
|
|
|
ref="goodsNameRef" |
|
|
|
|
className="goodsName" |
|
|
|
|
:input="() => debounce(handleFindGoods(item.goodsName, item), 1000)" |
|
|
|
|
:focus="handleCloseSelcet" |
|
|
|
|
v-model="item.goodsName" |
|
|
|
|
placeholder="货物名称" |
|
|
|
|
> |
|
|
|
|
<div v-loading="item.loading"> |
|
|
|
|
<template v-if="item.goodsListOptions.length > 0"> |
|
|
|
|
<div |
|
|
|
|
class="goodsNameRow" |
|
|
|
|
v-for="val in item.goodsListOptions" |
|
|
|
|
:key="val.goodsId" |
|
|
|
|
@click=" |
|
|
|
|
() => { |
|
|
|
|
item.goodsName = val.goodsName; |
|
|
|
|
item.goodsId = val.goodsId; |
|
|
|
|
handleCloseSelcet(); |
|
|
|
|
} |
|
|
|
|
" |
|
|
|
|
> |
|
|
|
|
{{ val.goodsName }} |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
<template v-else> |
|
|
|
|
<div class="goodsNameRow" @click="handleCloseSelcet">暂无数据</div> |
|
|
|
|
</template> |
|
|
|
|
</div> |
|
|
|
|
</SelectBox> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
@ -828,9 +861,12 @@
|
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<template v-if="slotProps.scope.column.label === '操作'"> |
|
|
|
|
<el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)"> |
|
|
|
|
<el-text |
|
|
|
|
v-if="details.orderStatus === 'haveData'" |
|
|
|
|
@click="handleShowPackageOrderList(slotProps.scope)" |
|
|
|
|
> |
|
|
|
|
包明细 |
|
|
|
|
</el-button> |
|
|
|
|
</el-text> |
|
|
|
|
</template> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
@ -858,7 +894,7 @@
|
|
|
|
|
</div> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
<!-- 选取订单 --> |
|
|
|
|
<!-- 提示是否继续开单 --> |
|
|
|
|
<el-dialog |
|
|
|
|
title="提示" |
|
|
|
|
:center="true" |
|
|
|
|
@ -920,6 +956,8 @@ import {
|
|
|
|
|
postFindWaybillDetail, |
|
|
|
|
postUpdateWaybill, |
|
|
|
|
postUpdateWaybillVerify, |
|
|
|
|
postOpenOrderOpenZeroWaybill, |
|
|
|
|
postFindCategoryInfo, |
|
|
|
|
} from '@/api/distribution/CreateOrder.js'; |
|
|
|
|
|
|
|
|
|
// 获取vue实例 |
|
|
|
|
@ -955,8 +993,6 @@ const details = reactive<any>({
|
|
|
|
|
departureWarehouseName: '', |
|
|
|
|
/** 到站 */ |
|
|
|
|
destination: [], |
|
|
|
|
/** 货号 */ |
|
|
|
|
'-totalNum': 0, |
|
|
|
|
/** 订单自编号 */ |
|
|
|
|
orderCode: '', |
|
|
|
|
/** 目的站名称 */ |
|
|
|
|
@ -964,7 +1000,7 @@ const details = reactive<any>({
|
|
|
|
|
/** 目的仓Id */ |
|
|
|
|
destinationWarehouseId: '', |
|
|
|
|
queryDestinationWarehouseName: '', |
|
|
|
|
/** 货物号 */ |
|
|
|
|
/** 货号 */ |
|
|
|
|
goodsCode: '', |
|
|
|
|
/** 发货单位id */ |
|
|
|
|
shipperId: '', |
|
|
|
|
@ -1433,6 +1469,9 @@ const shipperMobile = ref();
|
|
|
|
|
// 存放发货方节点的数组 |
|
|
|
|
const shipperNodeList = [shipper, shipperName, shipperMobile]; |
|
|
|
|
|
|
|
|
|
// 货物数组 |
|
|
|
|
const goodsNameRef = ref(); |
|
|
|
|
|
|
|
|
|
// 合计费用 |
|
|
|
|
const totalCost = computed(() => { |
|
|
|
|
// let _num = 0; |
|
|
|
|
@ -1532,36 +1571,58 @@ const onLoad = async (idsArr = []) => {
|
|
|
|
|
details.query.consigneeAddress = data.consigneeAddress || ''; |
|
|
|
|
|
|
|
|
|
details.query.destination = data.destinationArray; |
|
|
|
|
details.query.destinationWarehouseName = data.departureWarehouseName; |
|
|
|
|
details.query.destinationWarehouseId = data.departureWarehouseId; |
|
|
|
|
details.query.queryDestinationWarehouseName = data.departureWarehouseName; |
|
|
|
|
|
|
|
|
|
let _maxNum = 0; |
|
|
|
|
|
|
|
|
|
details.goodsList = data.goodsList.map(val => { |
|
|
|
|
val.num = isNumber(val.num) ? Number(val.num) : 0; |
|
|
|
|
val.price = isNumber(val.price) ? Number(val.price) : 0; |
|
|
|
|
val.volume = isNumber(val.volume) ? Number(val.volume) : 0; |
|
|
|
|
val.weight = isNumber(val.weight) ? Number(val.weight) : 0; |
|
|
|
|
|
|
|
|
|
val.chargeType = val.chargeType || 1; |
|
|
|
|
// 计算运费小计 |
|
|
|
|
handleComputed(val); |
|
|
|
|
// 计算件数最大值 |
|
|
|
|
_maxNum += val.num; |
|
|
|
|
console.log('val :>> ', val); |
|
|
|
|
return val; |
|
|
|
|
}); |
|
|
|
|
details.query.queryDestinationWarehouseName = data.destinationWarehouseName || ''; |
|
|
|
|
|
|
|
|
|
if (data.goodsList.length === 0) { |
|
|
|
|
details.goodsList = [ |
|
|
|
|
{ |
|
|
|
|
index: 0, |
|
|
|
|
/** 货物名称 */ |
|
|
|
|
goodsName: '', |
|
|
|
|
/** 品类Id */ |
|
|
|
|
goodsId: '', |
|
|
|
|
/** 计费方式 */ |
|
|
|
|
chargeType: 1, |
|
|
|
|
/** 件数 */ |
|
|
|
|
num: 0, |
|
|
|
|
/** 重量(kg) */ |
|
|
|
|
weight: 0, |
|
|
|
|
/** 体积(方) */ |
|
|
|
|
volume: 0, |
|
|
|
|
/** 单价 */ |
|
|
|
|
price: 0, |
|
|
|
|
/** 运费小计 */ |
|
|
|
|
subtotalFreight: 0, |
|
|
|
|
/** 货物list */ |
|
|
|
|
goodsListOptions: [], |
|
|
|
|
}, |
|
|
|
|
]; |
|
|
|
|
} else { |
|
|
|
|
details.goodsList = data.goodsList.map(val => { |
|
|
|
|
val.num = isNumber(val.num) ? Number(val.num) : 0; |
|
|
|
|
val.price = isNumber(val.price) ? Number(val.price) : 0; |
|
|
|
|
val.volume = isNumber(val.volume) ? Number(val.volume) : 0; |
|
|
|
|
val.weight = isNumber(val.weight) ? Number(val.weight) : 0; |
|
|
|
|
|
|
|
|
|
val.chargeType = val.chargeType || 1; |
|
|
|
|
|
|
|
|
|
val.goodsListOptions = []; |
|
|
|
|
// 计算运费小计 |
|
|
|
|
handleComputed(val); |
|
|
|
|
// 计算件数最大值 |
|
|
|
|
return val; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
info.value.maxNum = _maxNum; |
|
|
|
|
details.query.goodsCode = '-' + _maxNum; |
|
|
|
|
info.value.maxNum = data.totalNum; |
|
|
|
|
details.query.goodsCode = '-' + data.totalNum; |
|
|
|
|
|
|
|
|
|
if (data.defaultPayWay) { |
|
|
|
|
data.payWay = data.defaultPayWay; |
|
|
|
|
} else { |
|
|
|
|
details.query.payWay = data.payWayList.find(val => val.dictValue === '到付').dictKey || '2'; |
|
|
|
|
} |
|
|
|
|
details.query.transportType = '1'; |
|
|
|
|
details.query.transportType = details.query.transportType || '1'; |
|
|
|
|
// details.goodsCode = data['totalNum']; |
|
|
|
|
console.log('details.query', details.query); |
|
|
|
|
console.log('info.value :>> ', info.value); |
|
|
|
|
@ -1634,6 +1695,8 @@ const initPageInfo = async (idsArr = []) => {
|
|
|
|
|
price: 0, |
|
|
|
|
/** 运费小计 */ |
|
|
|
|
subtotalFreight: 0, |
|
|
|
|
/** 货物名称list */ |
|
|
|
|
goodsListOptions: [], |
|
|
|
|
}, |
|
|
|
|
]; |
|
|
|
|
else { |
|
|
|
|
@ -1648,6 +1711,8 @@ const initPageInfo = async (idsArr = []) => {
|
|
|
|
|
|
|
|
|
|
val.goodsName = val.productName; |
|
|
|
|
|
|
|
|
|
val.goodsListOptions = []; |
|
|
|
|
|
|
|
|
|
// 计算运费小计 |
|
|
|
|
if (!val.subtotalFreight) handleComputed(val); |
|
|
|
|
|
|
|
|
|
@ -1665,6 +1730,12 @@ const initPageInfo = async (idsArr = []) => {
|
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
const handleCloseSelcet = () => { |
|
|
|
|
shipperNodeList.forEach(val => val.value.handleClose()); |
|
|
|
|
consigneeNodeList.forEach(val => val.value.handleClose()); |
|
|
|
|
goodsNameRef.value.forEach(val => val.handleClose()); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 新增货物 */ |
|
|
|
|
const handleAdd = () => { |
|
|
|
|
if (info.value.maxNum <= details.totalObj.totalCount) { |
|
|
|
|
@ -1862,7 +1933,7 @@ const sizeChange = (pageSize: number) => {
|
|
|
|
|
/** 页码改变执行的回调 */ |
|
|
|
|
const currentChange = current => { |
|
|
|
|
details.page.pageNum = current; |
|
|
|
|
init(); |
|
|
|
|
onLoad(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 查看包明细 */ |
|
|
|
|
@ -1969,7 +2040,8 @@ const handleChooseShipper = (column, prop, order) => {
|
|
|
|
|
details.query.shipperAddress = column.linkAddress; |
|
|
|
|
details.query.shipperName = column.linkMan; |
|
|
|
|
details.query.shipperMobile = column.linkPhone; |
|
|
|
|
shipperNodeList.forEach(val => val.value.handleClose()); |
|
|
|
|
|
|
|
|
|
handleCloseSelcet(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 收货客户选择 */ |
|
|
|
|
@ -1980,7 +2052,7 @@ const handleChooseConsigner = (column, prop, order) => {
|
|
|
|
|
details.query.consigneeAddress = column.linkAddress; |
|
|
|
|
details.query.consigneeName = column.linkMan; |
|
|
|
|
details.query.consigneeMobile = column.linkPhone; |
|
|
|
|
consigneeNodeList.forEach(val => val.value.handleClose()); |
|
|
|
|
handleCloseSelcet(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 切换tabBar */ |
|
|
|
|
@ -2084,6 +2156,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
|
|
|
|
|
price: 0, |
|
|
|
|
/** 运费小计 */ |
|
|
|
|
subtotalFreight: 0, |
|
|
|
|
goodsListOptions: [], |
|
|
|
|
}, |
|
|
|
|
]; |
|
|
|
|
initPageInfo(); |
|
|
|
|
@ -2165,7 +2238,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
|
|
|
|
|
let res: any = {}; |
|
|
|
|
// 新增提交 |
|
|
|
|
if (details.pageInfo.type !== 'edit') { |
|
|
|
|
submitData.addList = submitData.goodsList; |
|
|
|
|
submitData.addList = details.goodsList; |
|
|
|
|
submitData.removeList = []; |
|
|
|
|
|
|
|
|
|
delete submitData.goodsList; |
|
|
|
|
@ -2178,7 +2251,9 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
|
|
|
|
|
// 记录提交参数 |
|
|
|
|
details.submitData = submitData; |
|
|
|
|
|
|
|
|
|
res = await postOpenOrderOpenWaybill(submitData); |
|
|
|
|
// 有数据开单 |
|
|
|
|
if (details.orderStatus === 'haveData') res = await postOpenOrderOpenWaybill(submitData); |
|
|
|
|
else res = await postOpenOrderOpenZeroWaybill(submitData); |
|
|
|
|
} else { |
|
|
|
|
submitData.waybillId = details.pageInfo.id; |
|
|
|
|
|
|
|
|
|
@ -2280,6 +2355,28 @@ const handleRepetition = () => {
|
|
|
|
|
resetForm(ruleFormRef.value); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 查询货物 */ |
|
|
|
|
const handleFindGoods = async (goodsName, item) => { |
|
|
|
|
console.log('goodsNameRef :>> ', goodsNameRef); |
|
|
|
|
console.log('item :>> ', item); |
|
|
|
|
item.goodsId = ''; |
|
|
|
|
|
|
|
|
|
if (!goodsName) return; |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
item.loading = true; |
|
|
|
|
const res = await postFindCategoryInfo({ goodsName }); |
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
|
|
|
|
|
if (code !== 200) return; |
|
|
|
|
item.goodsListOptions = data; |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
item.loading = false; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
watch( |
|
|
|
|
$route, |
|
|
|
|
async () => { |
|
|
|
|
@ -2287,6 +2384,8 @@ watch(
|
|
|
|
|
// 深拷贝基础数据 |
|
|
|
|
details.deepQuery = deepClone(details.query); |
|
|
|
|
|
|
|
|
|
details.orderStatus = $route.query.orderStatus; |
|
|
|
|
|
|
|
|
|
initPageInfo(); |
|
|
|
|
}, |
|
|
|
|
{ immediate: true } |
|
|
|
|
@ -2510,4 +2609,14 @@ $borderColor: #172e60;
|
|
|
|
|
background: #f00; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.goodsNameRow { |
|
|
|
|
background: #fff; |
|
|
|
|
transition: all 0.3s; |
|
|
|
|
padding: 10px 0; |
|
|
|
|
|
|
|
|
|
&:hover { |
|
|
|
|
background: #f5f7fa; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
