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

修复运单

dev-xx
qb 5 months ago
parent
19fcbffa59
commit
4ad949c8ad
2 changed files with 266 additions and 119 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. 357
      src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
  2. 28
      src/views/waybill/WaybillOrderList.vue

357
src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
Unescape View File

@ -1,127 +1,248 @@
<template> <template>
<div class="VehicleStowageTable"> <div class="VehicleStowageTable">
<table <table
style="width: 100%; text-align: center; border-collapse: collapse; border-spacing: 0; border-top: 1px solid #000; border-right: 1px solid #000;" style="
width: 100%;
text-align: center;
border-collapse: collapse;
border-spacing: 0;
border-top: 1px solid #000;
border-right: 1px solid #000;
"
> >
<tr> <tr>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="4"> <th style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="4">
<img style="height: 40px" src="../../../public/img/htlogo.png" alt="暂无图片" /> <img style="height: 40px" src="../../../public/img/htlogo.png" alt="暂无图片" />
</th> </th>
<th colspan="6" style="font-size: 20px; border-bottom: 1px solid #000; border-left: 1px solid #000;">干 线 装 载 清 单</th> <th
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" :colspan="6 + goodsTitleList.length + 1"> colspan="6"
<img id="imgcode" :src="renderInfo.carsNoBase64" /> style="font-size: 20px; border-bottom: 1px solid #000; border-left: 1px solid #000"
<div>{{ renderInfo.carsNo }}</div> >
</th> 干 线 装 载 清 单
</tr> </th>
<tr> <th
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="4">始发站：{{ renderInfo.startWarehouseName }}</th> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="6"> :colspan="6 + goodsTitleList.length + 1"
经停站：{{ >
renderInfo.endWarehouseNames.slice(0, renderInfo.endWarehouseNames.length - 1)[0] || <img id="imgcode" :src="renderInfo.carsNoBase64" />
'' <div>{{ renderInfo.carsNo }}</div>
}} </th>
</th> </tr>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" :colspan="6 + goodsTitleList.length + 1"> <tr>
目的站：{{ renderInfo.endWarehouseNames.slice(-1)[0] }} <th style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="4">
</th> 始发站：{{ renderInfo.startWarehouseName }}
</tr> </th>
<tr> <th style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="6">
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="4">司机：{{ renderInfo.assistantName || '' }}</th> 经停站：{{
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="2">司机电话：{{ renderInfo.assistantMobile || '' }}</th> renderInfo.endWarehouseNames.slice(0, renderInfo.endWarehouseNames.length - 1)[0] || ''
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="3">车牌号：{{ renderInfo.carNumber || '' }}</th> }}
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;">卸车完成时间： {{ renderInfo.unloadDate || '年 月 日' }}</th> </th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" :colspan="6 + goodsTitleList.length + 1">卸车人员签字</th> <th
</tr> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
<tr> :colspan="6 + goodsTitleList.length + 1"
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">序号</th> >
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">发货单位</th> 目的站：{{ renderInfo.endWarehouseNames.slice(-1)[0] }}
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">开单时间</th> </th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">始发仓</th> </tr>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">目的仓</th> <tr>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">收货单位</th> <th style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="4">
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">收货人</th> 司机：{{ renderInfo.assistantName || '' }}
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">收货电话</th> </th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">物流单号</th> <th style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="2">
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">合同号</th> 司机电话：{{ renderInfo.assistantMobile || '' }}
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">计划件数</th> </th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">货位</th> <th style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="3">
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" :colspan="goodsTitleList.length + 1">装车产品明细</th> 车牌号：{{ renderInfo.carNumber || '' }}
<!-- <th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">合计件数</th> --> </th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">卸车件数</th> <th style="border-bottom: 1px solid #000; border-left: 1px solid #000">
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">卸车网点</th> 卸车完成时间： {{ renderInfo.unloadDate || '年 月 日' }}
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">卸车时间</th> </th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">异常备注</th> <th
</tr> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
<tr> :colspan="6 + goodsTitleList.length + 1"
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" v-for="item in goodsTitleList" :key="item">{{ item }}</th> >
卸车人员签字
</th>
</tr>
<tr>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">序号</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
发货单位
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
开单时间
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
始发仓
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
目的仓
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
收货单位
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
收货人
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
收货电话
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
物流单号
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
合同号
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
计划件数
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">货位</th>
<th
style="border-bottom: 1px solid #000; border-left: 1px solid #000"
:colspan="goodsTitleList.length + 1"
>
装车产品明细
</th>
<!-- <th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" rowspan="2">合计件数</th> -->
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
卸车件数
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
卸车网点
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
卸车时间
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" rowspan="2">
异常备注
</th>
</tr>
<tr>
<th
style="border-bottom: 1px solid #000; border-left: 1px solid #000"
v-for="item in goodsTitleList"
:key="item"
>
{{ item }}
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;">小计</th> <th style="border-bottom: 1px solid #000; border-left: 1px solid #000">小计</th>
</tr> </tr>
<!-- 值 --> <!-- 值 -->
<tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all"> <tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all">
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;">{{ index + 1 }}</td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000">{{ index + 1 }}</td>
<!-- 发货单位 --> <!-- 发货单位 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.shipper || '' }}</td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<!-- 开单时间 --> {{ value.shipper || '' }}
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.createTime || '' }}</td> </td>
<!-- 始发仓 --> <!-- 开单时间 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.departureWarehouseName || '' }}</td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<!-- 目的仓 --> {{ value.createTime || '' }}
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.destinationWarehouseName || '' }}</td> </td>
<!-- 收货单位 --> <!-- 始发仓 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.consignee }}</td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<!-- 收货人 --> {{ value.departureWarehouseName || '' }}
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.consigneeName }}</td> </td>
<!-- 收货电话 --> <!-- 目的仓 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.consigneeMobile }}</td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<!-- 物流单号 --> {{ value.destinationWarehouseName || '' }}
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;">{{ value.waybillNo }}</td> </td>
<!-- 合同号 --> <!-- 收货单位 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;">{{ value.orderCode }}</td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<!-- 计划件数 --> {{ value.consignee }}
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.planNum }}</td> </td>
<!-- 货位 --> <!-- 收货人 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;"></td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable v-for="item in goodsTitleList"> {{ value.consigneeName }}
{{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }} </td>
</td> <!-- 收货电话 -->
<!-- 小计 --> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.smallTotal }}</td> {{ value.consigneeMobile }}
<!-- 合计件数 --> </td>
<!-- <td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.smallTotal }}</td> --> <!-- 物流单号 -->
<!-- 卸车件数 --> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000">
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.unloadNum }}</td> {{ value.waybillNo }}
<!-- 卸车网点 --> </td>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable></td> <!-- 合同号 -->
<!-- 卸车时间 --> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000">
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable></td> {{ value.orderCode }}
<!-- 异常备注 --> </td>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable></td> <!-- 计划件数 -->
</tr> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
{{ value.planNum }}
</td>
<!-- 货位 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000"></td>
<td
style="border-bottom: 1px solid #000; border-left: 1px solid #000"
contenteditable
v-for="item in goodsTitleList"
>
{{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }}
</td>
<!-- 小计 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
{{ value.smallTotal }}
</td>
<!-- 合计件数 -->
<!-- <td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.smallTotal }}</td> -->
<!-- 卸车件数 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
{{ value.unloadNum }}
</td>
<!-- 卸车网点 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable></td>
<!-- 卸车时间 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable></td>
<!-- 异常备注 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable></td>
</tr>
<!-- 合计行 --> <!-- 合计行 -->
<tr> <tr>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="10">合计</td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="10">
<!-- 合计 -- 计划件数 --> 合计
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ totalPlanNum }}</td> </td>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;"></td> <!-- 合计 -- 计划件数 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable v-for="item in goodsTitleList"></td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ totalNum }}</td> {{ totalPlanNum }}
<!-- 合计件数 --> </td>
<!-- <td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ totalNum }}</td> --> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000"></td>
<!-- 卸车件数 --> <td
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ totalUnLoadNum }}</td> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;"></td> contenteditable
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;"></td> v-for="item in goodsTitleList"
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;"></td> ></td>
</tr> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<tr> {{ totalNum }}
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="18" contenteditable> </td>
<span style="display: inline-block; margin-right: 20px; min-width: 200px;"> 投诉电话：4000184668 </span> <!-- 合计件数 -->
<span style="display: inline-block; margin-right: 20px; min-width: 200px;"> 营业部电话： </span> <!-- <td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ totalNum }}</td> -->
<span style="display: inline-block; margin-right: 20px; min-width: 200px;"> 系统单调度： </span> <!-- 卸车件数 -->
</td> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
</tr> {{ totalUnLoadNum }}
</td>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000"></td>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000"></td>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000"></td>
</tr>
<tr>
<td
style="border-bottom: 1px solid #000; border-left: 1px solid #000"
:colspan="17 + goodsTitleList.length"
contenteditable
>
<span style="display: inline-block; margin-right: 20px; min-width: 200px">
投诉电话：4000184668
</span>
<span style="display: inline-block; margin-right: 20px; min-width: 200px">
营业部电话：
</span>
<span style="display: inline-block; margin-right: 20px; min-width: 200px">
系统单调度：
</span>
</td>
</tr>
</table> </table>
</div> </div>
</template> </template>

28
src/views/waybill/WaybillOrderList.vue
Unescape View File

@ -13,7 +13,11 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="运单号:" class="el-times"> <el-form-item label="运单号:" class="el-times">
<el-input v-model="query.stockupArea" clearable placeholder="请输入运单号"></el-input> <el-input
v-model="query.waybillNoList"
clearable
placeholder="支持多运单查询,逗号拼接"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制单时间:" class="el-times"> <el-form-item label="制单时间:" class="el-times">
<el-date-picker <el-date-picker
@ -465,6 +469,10 @@ const onLoad = async (page?: any, params = {}) => {
submitData.documentMakingTimeEndStr = details.query.documentMakingTime[1]; submitData.documentMakingTimeEndStr = details.query.documentMakingTime[1];
} }
if (getObjType(submitData.waybillNoList) === 'string' && submitData.waybillNoList) {
submitData.waybillNoList = submitData.waybillNoList.replaceAll('，', ',').split(',');
} else delete submitData.waybillNoList;
delete submitData.createTime; delete submitData.createTime;
delete submitData.documentMakingTime; delete submitData.documentMakingTime;
@ -917,6 +925,24 @@ const handleExport = () => {
const submitData = { ...details.query }; const submitData = { ...details.query };
// 创建时间
if (getObjType(details.query.createTime) === 'array' && details.query.createTime.length > 0) {
submitData.createTimeStartStr = details.query.createTime[0];
submitData.createTimeEndStr = details.query.createTime[1];
}
// 创建时间
if (
getObjType(details.query.documentMakingTime) === 'array' &&
details.query.documentMakingTime.length > 0
) {
submitData.documentMakingTimeStartStr = details.query.documentMakingTime[0];
submitData.documentMakingTimeEndStr = details.query.documentMakingTime[1];
}
delete submitData.createTime;
delete submitData.documentMakingTime;
const res = await postExport(submitData); const res = await postExport(submitData);
console.log('res :>> ', res); console.log('res :>> ', res);

Write Preview
Loading…
Cancel
Save