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

修复干线部分bug

dev-xx
qb 5 months ago
parent
8103352174
commit
1fe7c954e4
9 changed files with 203 additions and 170 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. 215
      src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
  2. 96
      src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue
  3. 8
      src/option/distribution/VehicleArrivalManagement.js
  4. 8
      src/option/distribution/VehicleStowage.js
  5. 6
      src/views/distribution/artery/TripartiteTransfer.vue
  6. 6
      src/views/distribution/artery/VehicleArrivalManagement.vue
  7. 6
      src/views/distribution/artery/VehicleStowage.vue
  8. 4
      src/views/distribution/inventory/BookingNote.vue
  9. 24
      src/views/waybill/WaybillOrderList.vue

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

@ -129,103 +129,116 @@
<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"> <template v-if="renderInfo.mainList">
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000">{{ index + 1 }}</td> <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">
<td {{ index + 1 }}
v-if="value.mergeColumnIndex" </td>
style="border-bottom: 1px solid #000; border-left: 1px solid #000" <!-- 发货单位 -->
:rowspan="value.mergeColumnIndex" <td
contenteditable v-if="value.mergeColumnIndex"
> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
{{ value.shipper || '' }} :rowspan="value.mergeColumnIndex"
</td> contenteditable
<!-- 开单时间 --> >
<td {{ value.shipper || '' }}
v-if="value.mergeColumnIndex" </td>
style="border-bottom: 1px solid #000; border-left: 1px solid #000" <!-- 开单时间 -->
:rowspan="value.mergeColumnIndex" <td
contenteditable v-if="value.mergeColumnIndex"
> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
{{ value.createTime || '' }} :rowspan="value.mergeColumnIndex"
</td> contenteditable
<!-- 始发仓 --> >
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable> {{ value.createTime || '' }}
{{ value.departureWarehouseName || '' }} </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.departureWarehouseName || '' }}
{{ value.destinationWarehouseName || '' }} </td>
</td> <!-- 目的仓 -->
<!-- 收货单位 --> <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
<td {{ value.destinationWarehouseName || '' }}
v-if="value.mergeColumnIndex" </td>
style="border-bottom: 1px solid #000; border-left: 1px solid #000" <!-- 收货单位 -->
:rowspan="value.mergeColumnIndex" <td
contenteditable v-if="value.mergeColumnIndex"
> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
{{ value.consignee }} :rowspan="value.mergeColumnIndex"
</td> contenteditable
<!-- 收货人 --> >
<td {{ value.consignee }}
v-if="value.mergeColumnIndex" </td>
style="border-bottom: 1px solid #000; border-left: 1px solid #000" <!-- 收货人 -->
:rowspan="value.mergeColumnIndex" <td
contenteditable v-if="value.mergeColumnIndex"
> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
{{ value.consigneeName }} :rowspan="value.mergeColumnIndex"
</td> contenteditable
<!-- 收货电话 --> >
<td {{ value.consigneeName }}
v-if="value.mergeColumnIndex" </td>
style="border-bottom: 1px solid #000; border-left: 1px solid #000" <!-- 收货电话 -->
:rowspan="value.mergeColumnIndex" <td
contenteditable v-if="value.mergeColumnIndex"
> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
{{ value.consigneeMobile }} :rowspan="value.mergeColumnIndex"
</td> contenteditable
<!-- 物流单号 --> >
<td {{ value.consigneeMobile }}
v-if="value.mergeColumnIndex" </td>
style="border-bottom: 1px solid #000; border-left: 1px solid #000" <!-- 物流单号 -->
:rowspan="value.mergeColumnIndex" <td
> v-if="value.mergeColumnIndex"
{{ value.waybillNo }} style="border-bottom: 1px solid #000; border-left: 1px solid #000"
</td> :rowspan="value.mergeColumnIndex"
<!-- 合同号 --> >
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000"> {{ value.waybillNo }}
{{ value.orderCode }} </td>
</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.orderCode }}
{{ value.planNum }} </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"></td> {{ value.planNum }}
<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"></td>
v-for="item in goodsTitleList" <td
> style="border-bottom: 1px solid #000; border-left: 1px solid #000"
{{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }} contenteditable
</td> v-for="item in goodsTitleList"
<!-- 小计 --> >
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable> {{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }}
{{ value.smallTotal }} </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.smallTotal }}
<!-- 卸车件数 --> </td>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable> <!-- 合计件数 -->
{{ value.unloadNum }} <!-- <td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.smallTotal }}</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></td> {{ value.unloadNum }}
<!-- 卸车时间 --> </td>
<td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable></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"
</tr> 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>
</template>
<!-- 合计行 --> <!-- 合计行 -->
<tr> <tr>
@ -296,8 +309,6 @@ renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(',
let mergeStartIndex = 0; let mergeStartIndex = 0;
// 比对值 // 比对值
let comparisonValue = ''; let comparisonValue = '';
renderInfo.value.mainList[0].mergeColumnIndex = 1;
const handleMerge = (startIndex: number, endIndex: number, data: {}) => { const handleMerge = (startIndex: number, endIndex: number, data: {}) => {
for (let index = startIndex; index < endIndex; index++) { for (let index = startIndex; index < endIndex; index++) {
const value = data[index]; const value = data[index];
@ -312,8 +323,10 @@ const handleMerge = (startIndex: number, endIndex: number, data: {}) => {
for (let index = 0; index < renderInfo.value.mainList.length; index++) { for (let index = 0; index < renderInfo.value.mainList.length; index++) {
const element = renderInfo.value.mainList[index]; const element = renderInfo.value.mainList[index];
if (index === 0) comparisonValue = element.waybillNo; if (index === 0) {
comparisonValue = element.waybillNo;
element.mergeColumnIndex = 1;
}
totalNum.value += element.smallTotal || 0; totalNum.value += element.smallTotal || 0;
totalUnLoadNum.value += element.unloadNum || 0; totalUnLoadNum.value += element.unloadNum || 0;
totalPlanNum.value += element.planNum || 0; totalPlanNum.value += element.planNum || 0;

96
src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue
Unescape View File

@ -58,50 +58,52 @@
</thead> </thead>
<tbody> <tbody>
<!-- 值 --> <!-- 值 -->
<tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all"> <template v-if="renderInfo.mainList">
<td>{{ index + 1 }}</td> <tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all">
<!-- 发货单位 --> <td>{{ index + 1 }}</td>
<td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable> <!-- 发货单位 -->
{{ value.shipper || '' }} <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
</td> {{ value.shipper || '' }}
<!-- 开单时间 --> </td>
<td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable> <!-- 开单时间 -->
{{ value.createTime || '' }} <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
</td> {{ value.createTime || '' }}
<!-- 收货单位 --> </td>
<td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable> <!-- 收货单位 -->
{{ value.consignee }} <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
</td> {{ value.consignee }}
<!-- 收货人 --> </td>
<td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable> <!-- 收货人 -->
{{ value.consigneeName }} <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
</td> {{ value.consigneeName }}
<!-- 收货电话 --> </td>
<td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable> <!-- 收货电话 -->
{{ value.consigneeMobile }} <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
</td> {{ value.consigneeMobile }}
<!-- 物流单号 --> </td>
<td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex"> <!-- 物流单号 -->
{{ value.waybillNo }} <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex">
</td> {{ value.waybillNo }}
<!-- 合同号 --> </td>
<td>{{ value.orderCode }}</td> <!-- 合同号 -->
<!-- 计划件数 --> <td>{{ value.orderCode }}</td>
<td contenteditable>{{ value.planNum }}</td> <!-- 计划件数 -->
<!-- 货位 --> <td contenteditable>{{ value.planNum }}</td>
<td></td> <!-- 货位 -->
<td contenteditable v-for="item in goodsTitleList"> <td></td>
{{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }} <td contenteditable v-for="item in goodsTitleList">
</td> {{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }}
<!-- 小计 --> </td>
<td contenteditable>{{ value.smallTotal }}</td> <!-- 小计 -->
<!-- 合计件数 --> <td contenteditable>{{ value.smallTotal }}</td>
<td contenteditable>{{ value.smallTotal }}</td> <!-- 合计件数 -->
<!-- 卸车件数 --> <td contenteditable>{{ value.smallTotal }}</td>
<td contenteditable>{{ value.unloadNum }}</td> <!-- 卸车件数 -->
<!-- 异常备注 --> <td contenteditable>{{ value.unloadNum }}</td>
<td contenteditable></td> <!-- 异常备注 -->
</tr> <td contenteditable></td>
</tr>
</template>
<!-- 合计行 --> <!-- 合计行 -->
<tr> <tr>
@ -157,7 +159,6 @@ const isShowTotal = ref(false);
let mergeStartIndex = 0; let mergeStartIndex = 0;
// 比对值 // 比对值
let comparisonValue = ''; let comparisonValue = '';
renderInfo.value.mainList[0].mergeColumnIndex = 1;
const handleMerge = (startIndex: number, endIndex: number, data: {}) => { const handleMerge = (startIndex: number, endIndex: number, data: {}) => {
for (let index = startIndex; index < endIndex; index++) { for (let index = startIndex; index < endIndex; index++) {
@ -174,7 +175,10 @@ renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(',
for (let index = 0; index < renderInfo.value.mainList.length; index++) { for (let index = 0; index < renderInfo.value.mainList.length; index++) {
const element = renderInfo.value.mainList[index]; const element = renderInfo.value.mainList[index];
if (index === 0) comparisonValue = element.waybillNo; if (index === 0) {
comparisonValue = element.waybillNo;
element.mergeColumnIndex = 1;
}
totalNum.value += element.smallTotal || 0; totalNum.value += element.smallTotal || 0;
totalUnLoadNum.value += element.unloadNum || 0; totalUnLoadNum.value += element.unloadNum || 0;

8
src/option/distribution/VehicleArrivalManagement.js
Unescape View File

@ -145,7 +145,7 @@ export const columnList = [
{ {
prop: 'driverName', prop: 'driverName',
label: '主驾司机', label: '主驾司机',
type: 1, type: 2,
values: '', values: '',
width: '130', width: '130',
checkarr: [], checkarr: [],
@ -165,7 +165,7 @@ export const columnList = [
{ {
prop: 'carNumber', prop: 'carNumber',
label: '车牌号', label: '车牌号',
type: 1, type: 2,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -175,7 +175,7 @@ export const columnList = [
{ {
prop: 'startWarehouseName', prop: 'startWarehouseName',
label: '起点仓库', label: '起点仓库',
type: 1, type: 2,
values: '', values: '',
width: '130', width: '130',
checkarr: [], checkarr: [],
@ -185,7 +185,7 @@ export const columnList = [
{ {
prop: 'endWarehouseNames', prop: 'endWarehouseNames',
label: '终点仓库', label: '终点仓库',
type: 1, type: 2,
values: '', values: '',
width: '130', width: '130',
checkarr: [], checkarr: [],

8
src/option/distribution/VehicleStowage.js
Unescape View File

@ -145,7 +145,7 @@ export const columnList = [
{ {
prop: 'driverName', prop: 'driverName',
label: '主驾司机', label: '主驾司机',
type: 1, type: 2,
values: '', values: '',
width: '130', width: '130',
checkarr: [], checkarr: [],
@ -165,7 +165,7 @@ export const columnList = [
{ {
prop: 'carNumber', prop: 'carNumber',
label: '车牌号', label: '车牌号',
type: 1, type: 2,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -175,7 +175,7 @@ export const columnList = [
{ {
prop: 'startWarehouseName', prop: 'startWarehouseName',
label: '起点仓库', label: '起点仓库',
type: 1, type: 2,
values: '', values: '',
width: '130', width: '130',
checkarr: [], checkarr: [],
@ -185,7 +185,7 @@ export const columnList = [
{ {
prop: 'endWarehouseNames', prop: 'endWarehouseNames',
label: '终点仓库', label: '终点仓库',
type: 1, type: 2,
values: '', values: '',
width: '130', width: '130',
checkarr: [], checkarr: [],

6
src/views/distribution/artery/TripartiteTransfer.vue
Unescape View File

@ -499,6 +499,12 @@
></edittablehead> ></edittablehead>
</template> </template>
<script lang="ts">
export default {
name: '/distribution/artery/TripartiteTransfer',
};
</script>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue'; import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
import functions from '@/utils/functions'; import functions from '@/utils/functions';

6
src/views/distribution/artery/VehicleArrivalManagement.vue
Unescape View File

@ -639,6 +639,12 @@
></edittablehead> ></edittablehead>
</template> </template>
<script lang="ts">
export default {
name: '/distribution/artery/VehicleArrivalManagement',
};
</script>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue'; import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
import dayjs from 'dayjs'; import dayjs from 'dayjs';

6
src/views/distribution/artery/VehicleStowage.vue
Unescape View File

@ -599,6 +599,12 @@
></edittablehead> ></edittablehead>
</template> </template>
<script lang="ts">
export default {
name: '/distribution/artery/VehicleStowage',
};
</script>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue'; import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
import functions from '@/utils/functions'; import functions from '@/utils/functions';

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

@ -685,7 +685,7 @@
<el-form-item label-width="fit-content" label="支付方式:"> <el-form-item label-width="fit-content" label="支付方式:">
<el-select disabled v-model="query.payType" :teleported="false"> <el-select disabled v-model="query.payType" :teleported="false">
<el-option <el-option
v-for="item in details.info.payTypeList" v-for="item in query.payTypeList"
:key="item.dictValue" :key="item.dictValue"
:label="item.dictValue" :label="item.dictValue"
:value="item.dictKey" :value="item.dictKey"
@ -696,7 +696,7 @@
<el-form-item label="付款方式:" label-width="fit-content" prop="payWay"> <el-form-item label="付款方式:" label-width="fit-content" prop="payWay">
<el-select disabled v-model="query.payWay" :teleported="false"> <el-select disabled v-model="query.payWay" :teleported="false">
<el-option <el-option
v-for="item in details.info.payWayList" v-for="item in query.payWayList"
:key="item.dictValue" :key="item.dictValue"
:label="item.dictValue" :label="item.dictValue"
:value="item.dictKey" :value="item.dictKey"

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

@ -109,13 +109,14 @@
@click="handleBatchRecover" @click="handleBatchRecover"
>恢 复</el-button >恢 复</el-button
> >
<!-- 导出 -->
<el-button <el-button
type="primary" type="primary"
icon="Download" icon="Download"
v-if="permissionObj.WaybillOrderList_export" v-if="permissionObj.WaybillOrderList_export"
@click="handleExport" @click="handleExport"
>导 出</el-button >导 出
> </el-button>
</div> </div>
<!-- 头部右侧按钮模块 --> <!-- 头部右侧按钮模块 -->
<div class="avue-crud__right"> <div class="avue-crud__right">
@ -127,6 +128,7 @@
<!-- 列表模块 --> <!-- 列表模块 -->
<tablecmt <tablecmt
ref="tableNodeRef"
:columnList="details.columnList" :columnList="details.columnList"
:tableData="data" :tableData="data"
:loading="loadingObj.list" :loading="loadingObj.list"
@ -416,6 +418,8 @@ const details = reactive<any>({
warehouseOption: [], warehouseOption: [],
}); });
const tableNodeRef = ref();
const { search, query, shortcuts, data, loadingObj, selectionList, drawerShow, page, popUpShow } = const { search, query, shortcuts, data, loadingObj, selectionList, drawerShow, page, popUpShow } =
toRefs(details); toRefs(details);
@ -455,14 +459,6 @@ const permissionObj = reactive({
}), }),
}); });
onMounted(() => {
const timer = setTimeout(() => {
details.listNode = document.querySelector('.maboxhi');
details.listNode.style.transition = 'all .5s ease-out';
clearTimeout(timer);
}, 100);
});
/** 请求页面数据 */ /** 请求页面数据 */
const onLoad = async (page?: any, params = {}) => { const onLoad = async (page?: any, params = {}) => {
try { try {
@ -559,10 +555,10 @@ const showdrawer = (_flag?: boolean) => {
}; };
/** 是否开启搜索区 */ /** 是否开启搜索区 */
const searchHide = () => { const searchHide = async () => {
details.search = !details.search; details.search = !details.search;
await nextTick();
setNodeHeight(details.listNode, '', true); setNodeHeight(tableNodeRef.value.$el, '', true);
}; };
/** 表格表头输入框搜索 */ /** 表格表头输入框搜索 */
@ -982,6 +978,8 @@ const handleExport = () => {
delete submitData.createTime; delete submitData.createTime;
delete submitData.documentMakingTime; delete submitData.documentMakingTime;
if (details.selectionList.length > 0)
submitData.ids = details.selectionList.map(val => val.id).join(',');
const res = await postExport(submitData); const res = await postExport(submitData);

Write Preview
Loading…
Cancel
Save