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

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 5 months ago
parent
468a13958f 4ad949c8ad
commit
fb3da3bb9c
4 changed files with 267 additions and 122 deletions
Split View
  1. 357
      src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
  2. 2
      src/components/edittablehead/index.vue
  3. 2
      src/views/distribution/inventory/BookingNote.vue
  4. 28
      src/views/waybill/WaybillOrderList.vue

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

@ -1,127 +1,248 @@
<template>
<div class="VehicleStowageTable">
<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>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="4">
<img style="height: 40px" src="../../../public/img/htlogo.png" alt="暂无图片" />
</th>
<th colspan="6" style="font-size: 20px; border-bottom: 1px solid #000; border-left: 1px solid #000;">干 线 装 载 清 单</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" :colspan="6 + goodsTitleList.length + 1">
<img id="imgcode" :src="renderInfo.carsNoBase64" />
<div>{{ renderInfo.carsNo }}</div>
</th>
</tr>
<tr>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="4">始发站：{{ renderInfo.startWarehouseName }}</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" colspan="6">
经停站：{{
renderInfo.endWarehouseNames.slice(0, renderInfo.endWarehouseNames.length - 1)[0] ||
''
}}
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000;" :colspan="6 + goodsTitleList.length + 1">
目的站：{{ renderInfo.endWarehouseNames.slice(-1)[0] }}
</th>
</tr>
<tr>
<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>
<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 style="border-bottom: 1px solid #000; border-left: 1px solid #000;" :colspan="6 + goodsTitleList.length + 1">卸车人员签字</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>
<tr>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="4">
<img style="height: 40px" src="../../../public/img/htlogo.png" alt="暂无图片" />
</th>
<th
colspan="6"
style="font-size: 20px; border-bottom: 1px solid #000; border-left: 1px solid #000"
>
干 线 装 载 清 单
</th>
<th
style="border-bottom: 1px solid #000; border-left: 1px solid #000"
:colspan="6 + goodsTitleList.length + 1"
>
<img id="imgcode" :src="renderInfo.carsNoBase64" />
<div>{{ renderInfo.carsNo }}</div>
</th>
</tr>
<tr>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="4">
始发站：{{ renderInfo.startWarehouseName }}
</th>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000" colspan="6">
经停站：{{
renderInfo.endWarehouseNames.slice(0, renderInfo.endWarehouseNames.length - 1)[0] || ''
}}
</th>
<th
style="border-bottom: 1px solid #000; border-left: 1px solid #000"
:colspan="6 + goodsTitleList.length + 1"
>
目的站：{{ renderInfo.endWarehouseNames.slice(-1)[0] }}
</th>
</tr>
<tr>
<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>
<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
style="border-bottom: 1px solid #000; border-left: 1px solid #000"
:colspan="6 + goodsTitleList.length + 1"
>
卸车人员签字
</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>
</tr>
<!-- 值 -->
<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;" contenteditable>{{ value.shipper || '' }}</td>
<!-- 开单时间 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.createTime || '' }}</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.destinationWarehouseName || '' }}</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.consigneeName }}</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;">{{ value.waybillNo }}</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.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>
<th style="border-bottom: 1px solid #000; border-left: 1px solid #000">小计</th>
</tr>
<!-- 值 -->
<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" contenteditable>
{{ value.shipper || '' }}
</td>
<!-- 开单时间 -->
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
{{ value.createTime || '' }}
</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.destinationWarehouseName || '' }}
</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.consigneeName }}
</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">
{{ value.waybillNo }}
</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.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>
<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;" contenteditable>{{ totalPlanNum }}</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>{{ totalNum }}</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;" contenteditable>{{ 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="18" 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>
<!-- 合计行 -->
<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" contenteditable>
{{ totalPlanNum }}
</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>
{{ totalNum }}
</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" contenteditable>
{{ 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>
</div>
</template>

2
src/components/edittablehead/index.vue
Unescape View File

@ -220,7 +220,7 @@ const initSortable = () => {
// functions.setStorage($route.fullPath + props.columnListName, arr);
postSaveTableSeting({
tableKey: $route.fullPath + props.columnListName,
tableKey: $route.path + props.columnListName,
tableSetCongig: JSON.stringify(arr),
});
// emit('update:modelValue', arr);

2
src/views/distribution/inventory/BookingNote.vue
Unescape View File

@ -1755,7 +1755,6 @@ const handleEdit = () => {
name: '改单',
id: $route.query.id,
type: 'edit',
backPath: '/waybill/WaybillOrderList',
orderStatus: Number(details.query.waybillType) === 1 ? 'haveData' : 'notHaveData',
},
});
@ -1769,7 +1768,6 @@ const handleEdit = () => {
name: '改单',
id: $route.query.id,
type: 'edit',
backPath: '/waybill/WaybillOrderList',
},
});
}

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

@ -13,7 +13,11 @@
</el-form-item> -->
<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 label="制单时间:" class="el-times">
<el-date-picker
@ -465,6 +469,10 @@ const onLoad = async (page?: any, params = {}) => {
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.documentMakingTime;
@ -917,6 +925,24 @@ const handleExport = () => {
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);
console.log('res :>> ', res);

Write Preview
Loading…
Cancel
Save