Browse Source

新增发车前审核异常功能

dev-xx
qb 1 year ago
parent
commit
7b17c6a07a
  1. 11
      src/api/distribution/VehicleStowage.js
  2. 24
      src/option/distribution/TripartiteTransfer.js
  3. 124
      src/option/distribution/VehicleStowage.js
  4. 4
      src/views/distribution/artery/AddVehicleStowage.vue
  5. 644
      src/views/distribution/artery/TripartiteTransfer.vue
  6. 441
      src/views/distribution/artery/VehicleArrivalManagement.vue
  7. 299
      src/views/distribution/artery/VehicleStowage.vue
  8. 42
      src/views/distribution/artery/handleLoadingDestination.vue

11
src/api/distribution/VehicleStowage.js

@ -114,3 +114,14 @@ export const postFindNextNodeList = data => {
data,
});
};
/**
* 删除异常数据
*/
export const postRemoveCarsLoadScan = data => {
return request({
url: 'logpm-trunkline/api/carsLoad/removeCarsLoadScan ',
method: 'post',
data,
});
};

24
src/option/distribution/TripartiteTransfer.js

@ -18,7 +18,7 @@ export const columnList = [
{
prop: 'carsNo',
label: '中转批次号',
type: 6,
type: 13,
values: '',
width: '150',
checkarr: [],
@ -29,7 +29,7 @@ export const columnList = [
{
prop: 'carrierName',
label: '承运商',
type: 1,
type: 2,
values: '',
width: '180',
checkarr: [],
@ -49,7 +49,7 @@ export const columnList = [
{
prop: 'payMethodName',
label: '付款方式',
type: 1,
type: 3,
values: '',
width: '130',
checkarr: [],
@ -59,7 +59,7 @@ export const columnList = [
{
prop: 'countTransportCost',
label: '运费',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -79,7 +79,7 @@ export const columnList = [
{
prop: 'carrierOrderCode',
label: '承运单号',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -89,7 +89,7 @@ export const columnList = [
{
prop: 'startWarehouseName',
label: '发站仓库',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -99,7 +99,7 @@ export const columnList = [
{
prop: 'loadStatusName',
label: '状态',
type: 1,
type: 3,
values: '',
width: '130',
checkarr: [],
@ -109,7 +109,7 @@ export const columnList = [
{
prop: 'isSettlementName',
label: '是否结算',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -119,7 +119,7 @@ export const columnList = [
{
prop: 'customerTypeName',
label: '客户类型',
type: 1,
type: 3,
values: '',
width: '130',
checkarr: [],
@ -159,7 +159,7 @@ export const columnList = [
{
prop: 'deliveryTypeName',
label: '送货方式',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -169,7 +169,7 @@ export const columnList = [
{
prop: 'operator',
label: '经办人',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -199,7 +199,7 @@ export const columnList = [
{
prop: 'settlementPerson',
label: '结算人',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],

124
src/option/distribution/VehicleStowage.js

@ -765,6 +765,7 @@ export const packageColumnList = [
{
prop: 'orderCode',
label: '合同号',
width: '130',
type: 2,
values: '',
checkarr: [],
@ -775,6 +776,7 @@ export const packageColumnList = [
{
prop: 'scanCode',
label: '包条码',
width: '130',
type: 2,
values: '',
checkarr: [],
@ -785,6 +787,127 @@ export const packageColumnList = [
{
prop: 'waybillNo',
label: '运单号',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'nodeName',
label: '目的地',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'firsts',
label: '一级品',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'second',
label: '二级品',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'third',
label: '三级品',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'mallName',
label: '商场',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'mallPerson',
label: '商场联系人',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'mallPersonMobile',
label: '商场联系人电话',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'mallAddress',
label: '商场地址',
width: '150',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'customerName',
label: '最终客户',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'customerMobile',
label: '客户电话',
width: '130',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'customerAddress',
label: '客户地址',
width: '150',
type: 2,
values: '',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'remark',
label: '备注',
width: '130',
type: 2,
values: '',
checkarr: [],
@ -794,6 +917,7 @@ export const packageColumnList = [
{
prop: '',
label: '操作',
width: '200',
type: 6,
values: '',
checkarr: [],

4
src/views/distribution/artery/AddVehicleStowage.vue

@ -235,8 +235,8 @@
Number(details.pageType) === 2 ||
slotProps.scope.row.blackList.includes(slotProps.scope.column.property)
"
@input="handleComputedNum"
v-model="slotProps.scope.row[slotProps.scope.column.property]"
@change="handleComputedNum"
v-model.lazy="slotProps.scope.row[slotProps.scope.column.property]"
/>
</template>
</tablecmt>

644
src/views/distribution/artery/TripartiteTransfer.vue

@ -162,84 +162,7 @@
</div>
</basic-container>
<!-- 编辑弹窗 -->
<el-dialog
title="装车明细"
v-model="details.popUpShow.truckLoadingDetailVisited"
width="80%"
:before-close="beforeClose"
append-to-body
class="truckLoadingDetailPopUp"
>
<el-form :inline="true" :model="query" class="el-fr-d">
<div class="fo-fl">
<el-form-item label="扫码时间:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item label="卸车时间:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Edit" @click="searchChange">中转批量签收</el-button>
<el-button type="primary" icon="el-icon-search" @click="searchReset()"> </el-button>
<el-button icon="el-icon-printer" @click="searchReset()">二维码</el-button>
<el-button
icon="Operation"
@click="showdrawer(true, 'truckLoadingDetail')"
circle
></el-button>
</el-form-item>
</div>
</el-form>
<tablecmt
:columnList="details.detailsColumnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps"> </template>
</tablecmt>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="trickleLoadingPage.pageNum"
:page-sizes="[30, 50, 80, 120]"
:page-size="trickleLoadingPage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="trickleLoadingPage.total"
>
</el-pagination>
</el-dialog>
<!-- 编辑弹窗 -->
<!-- 确认到达信息 -->
<el-dialog
title="确认到达信息"
v-model="details.popUpShow.confirmArriveVisited"
@ -277,295 +200,118 @@
</div>
</el-dialog>
<!-- 创建 && 编辑 中转 -->
<!-- 配置装车目的地 -->
<el-dialog
title="新增中转"
v-model="details.popUpShow.transferVisited"
title="配置装车目的地"
v-model="details.popUpShow.truckLoadingDetailVisited"
width="80%"
:before-close="beforeClose"
append-to-body
class="transferPopUp"
:fullscreen="details.fullscreenObj.truckLoadingDetailPopUp"
:show-close="false"
class="truckLoadingDetailPopUp"
v-loading="details.loadingObj.truckLoadingDetailPopUpTable"
>
<el-form :inline="true" label-width="100px" :model="query" class="el-fr-d">
<div class="fo-fl">
<el-form-item label="中转承运商">
<el-select
teleported="true"
v-model="query.value"
class="m-2"
placeholder="Select"
size="default"
>
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="经办人">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="送货方式">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="付款方式">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="运费分摊方式">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="送货司机">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="客户类型">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否结算">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="代收贷款">
<el-input-number :precision="2" :step="1" controls-position="right" />
</el-form-item>
<el-form-item label="承运单号">
<el-input />
</el-form-item>
<el-form-item label="承运时间">
<el-date-picker
v-model="query.value1"
type="date"
placeholder="承运时间"
size="default"
/>
</el-form-item>
<el-form-item label="客户收货时间">
<el-date-picker
v-model="query.value1"
type="date"
placeholder="客户收货时间"
size="default"
/>
</el-form-item>
<el-form-item label="运费">
<el-input-number :precision="2" :step="1" controls-position="right" />
</el-form-item>
<el-form-item label="司机结算费">
<el-input-number :precision="2" :step="1" controls-position="right" />
</el-form-item>
</div>
<div style="width: 100%">
<el-form-item label="备注"> <el-input type="textarea" placeholder="备注" /></el-form-item>
</div>
</el-form>
<div class="add_row">
<!-- 列表模块 -->
<div style="width: 47%">
<div class="add_row_title">运单池</div>
<div v-if="!search">
<el-form :inline="true" label-width="80px" :model="details.oldQuery" class="el-fr-d">
<div class="fo-fl">
<el-form-item label="备注" class="el-times">
<el-input></el-input>
</el-form-item>
<el-form-item label="托盘码" class="el-times">
<el-input></el-input>
</el-form-item>
<el-form-item class="el-times">
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开单日期"
end-placeholder="开单日期"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchReset()"
> </el-button
>
<el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
</el-form-item>
</div>
</el-form>
</div>
<div style="margin-bottom: 10px" class="flex-c-sb">
<!-- 控件 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true, 1)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
<el-button type="text" style="cursor: pointer" @click="handleAddWaybill">
加入调度池
<el-icon><CaretRight /></el-icon>
<!-- 标题 -- 头部控件区 -->
<template #header="{ close, titleId, titleClass }">
<div class="my-header flex-c-sb">
<div class="fwb" :id="titleId" :class="titleClass">配置装车目的地</div>
<div class="flex-c-c">
<!-- 全屏显示按钮 -->
<el-button type="text" v-if="!details.fullscreenObj.truckLoadingDetailPopUp">
<el-icon class="" @click="handleFullScrean('open', 'truckLoadingDetailPopUp')"
><FullScreen
/></el-icon>
</el-button>
<el-button type="text" v-else>
<el-icon class="" @click="handleFullScrean('close', 'truckLoadingDetailPopUp')"
><CopyDocument
/></el-icon>
</el-button>
</div>
<tablecmt
:columnList="details.oldColumnList"
:tableData="details.oldData"
:loading="loadingObj.oldListLoading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
</tablecmt>
<!-- 统计行 -->
<div class="statistics_row">
<!-- <div>合计: 选择数: {{ addInfo.oldSelectionList.length }}</div>
<div>件数: {{ selectionList.length }}</div>
<div>重量: {{ selectionList.length }}</div>
<div>体积: {{ selectionList.length }}</div> -->
</div>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
style="zoom: 0.9"
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="zeroAdditionalRecordingInfo.oldPage.pageNum"
:page-sizes="[30, 50, 80, 120]"
:page-size="zeroAdditionalRecordingInfo.oldPage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="zeroAdditionalRecordingInfo.oldPage.total"
>
</el-pagination>
<!-- 弹窗关闭按钮 -->
<el-button type="text">
<el-icon class="" @click="close"><Close /></el-icon>
</el-button>
</div>
</div>
</template>
<!-- 列表模块 -->
<div style="width: 47%">
<div class="add_row_title">调度池</div>
<div v-if="!search">
<el-form :inline="true" label-width="80px" :model="details.newQuery" class="el-fr-d">
<div class="fo-fl">
<el-form-item label="备注" class="el-times">
<el-input></el-input>
</el-form-item>
<el-form-item label="托盘码" class="el-times">
<el-input></el-input>
</el-form-item>
<el-form-item class="el-times">
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开单日期"
end-placeholder="开单日期"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchReset()"
> </el-button
>
<el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
</el-form-item>
</div>
</el-form>
</div>
<div v-loading="details.loadingObj.truckLoadingDetailPopUpLoading">
<el-button
icon="Edit"
type="primary"
v-if="details.nextNodeData.length > 1"
@click="handleOpenConfiguration('batch')"
>
配置目的地
</el-button>
<div style="margin-bottom: 10px" class="flex-c-sb">
<el-button type="text" class="pointer" @click="handleRemoveWaybill">
<el-icon><CaretLeft /></el-icon>
移除调度池
</el-button>
<tablecmt
class="truckLoadingDetailPopUpTable mt10"
:columnList="details.packageColumnList"
:tableData="details.packageRenderData"
:loading="loadingObj.list"
@inputTxt="packageInputsc"
@selection="list => (details.packageSelectedData = list)"
>
<template #default="slotProps">
<el-text
v-if="details.nextNodeData.length > 1"
@click="handleOpenConfiguration('one', slotProps.scope)"
>配置目的地</el-text
>
<el-text @click="removePackage(slotProps.scope)">移除</el-text>
</template>
</tablecmt>
<!-- 控件 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true, 2)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
<tablecmt
:columnList="details.newColumnList"
:tableData="details.newData"
:loading="loadingObj.newListLoading"
@inputTxt="newInputsc"
@timeCheck="newTimesc"
@btnCheck="newBtnsc"
@selectCheck="newSelectsc"
@selection="newSelectionChange"
<div class="dialog-footer">
<el-button
icon="el-icon-circle-close"
@click="details.popUpShow.truckLoadingDetailVisited = false"
> </el-button
>
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
> </el-button
>
</tablecmt>
<div class="statistics_row">
<!-- <div>合计: 选择数: {{ addInfo.oldSelectionList.length }}</div>
<div>件数: {{ selectionList.length }}</div>
<div>重量: {{ selectionList.length }}</div>
<div>体积: {{ selectionList.length }}</div> -->
</div>
</div>
<!-- <el-button></el-button> -->
</div>
</el-dialog>
<!-- 配置装车目的地 -->
<el-dialog
title="配置装车目的地"
v-model="details.popUpShow.chooseDestinationVisited"
width="30%"
append-to-body
class="truckLoadingDetailPopUp"
>
<el-form-item label="目的地" prop="region">
<el-select v-model="details.chooseNodeId" placeholder="请选择目的地" class="w100">
<el-option
v-for="item in details.nextNodeData"
:key="item"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- 表单按钮 -->
<template #footer>
<div class="dialog-footer">
<el-button
icon="el-icon-circle-close"
@click="details.popUpShow.chooseDestinationVisited = false"
> </el-button
>
<el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit">
</el-button>
</div>
</template>
</el-dialog>
<!-- 列表配置显示 -->
<edittablehead
@setcolum="setnewcolum"
@ -582,19 +328,22 @@ import dayjs from 'dayjs';
import { mapGetters } from 'vuex';
/** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict';
import { downloadXls } from '@/utils/util';
import {
columnList,
detailsColumnList,
oldColumnList,
newColumnList,
} from '@/option/distribution/TripartiteTransfer';
import { downloadXls, deepClone, setNodeHeight } from '@/utils/util';
import { columnList, detailsColumnList } from '@/option/distribution/TripartiteTransfer';
import { packageColumnList } from '@/option/distribution/VehicleStowage';
import {
postArriveCars,
postTripartiteTransferPageList,
postStartCars,
postCancelStartCars,
} from '@/api/distribution/TripartiteTransfer.js';
import {
postStartCarByLoadId,
postDetermineHasNoFinalNode,
postFindNextNodeList,
postUpdateLoadScanFinalNodeIdById,
postRemoveCarsLoadScan,
} from '@/api/distribution/VehicleStowage';
import { ElMessage, ElMessageBox } from 'element-plus';
import { useRouter } from 'vue-router';
@ -644,19 +393,14 @@ const details = reactive<any>({
detailsColumnList,
/** 修改的列表信息 */
editColumnList: [],
/** 运单池 */
oldColumnList,
/** 调度池 */
newColumnList,
/** 列表数据 */
data: [],
newData: [],
oldData: [],
/** 页面loading */
loadingObj: {
/** 列表加载loading */
list: false,
oldListLoading: false,
/** 配置装车目的地详情 */
truckLoadingDetailPopUpLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
@ -668,32 +412,18 @@ const details = reactive<any>({
pageSize: 30,
total: 0,
},
/** 装车明细分页参数 */
trickleLoadingPage: {
pageNum: 1,
pageSize: 30,
total: 0,
},
/** 弹出层显示 */
popUpShow: {
/** 装车详情 */
truckLoadingDetailVisited: false,
/** 零担补录 */
transferVisited: false,
/** 到达确认 */
confirmArriveVisited: false,
/** 配置目的地 */
truckLoadingDetailVisited: false,
/** 选择目的地弹窗 */
chooseDestinationVisited: false,
},
/** 列表Dom节点 */
listNode: '',
form: {},
/** 零担补录信息 */
zeroAdditionalRecordingInfo: {
oldPage: {
pageSize: 30,
pageNum: 1,
total: 0,
},
},
/** 无用 */
options: [],
/** 付款方式 */
@ -725,8 +455,30 @@ const details = reactive<any>({
{ value: 1, label: '自提' },
{ value: 2, label: '送货' },
],
/** 全屏 */
fullscreenObj: {
/** 配置节点 */
truckLoadingDetailPopUp: false,
comparativeStatementPopUp: false,
},
packageColumnList: deepClone(packageColumnList),
/** 配置装车目的地数据 */
packageData: [],
/** 配置装车目的地数据 -- 渲染数据 */
packageRenderData: [],
/** 后续装车目的地 */
nextNodeData: [],
/** 配置目的地 -- 被选中的数据 */
packageSelectedData: [],
/** 被修改的数据 */
modifyData: [],
/** 被选中的数据 */
chooseNodeId: '',
packageQuery: {},
});
// details.columnList.payMethodName.checkArr = details.payMethodOptions;
const {
search,
query,
@ -737,8 +489,6 @@ const {
selectionList,
drawerShow,
page,
trickleLoadingPage,
zeroAdditionalRecordingInfo,
popUpShow,
} = toRefs(details);
@ -746,15 +496,6 @@ const {
const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
console.log('permission :>> ', permission);
onMounted(() => {
const timer = setTimeout(() => {
details.listNode = document.querySelector('.maboxhi');
details.listNode.style.transition = 'all .5s ease-out';
console.log('details.listNode :>> ', details.listNode);
clearTimeout(timer);
}, 100);
});
/** 转换码值 */
const handleConversionCodeValue = (item, label, Arr) => {
const codes = Arr.map(item => item.value);
@ -763,6 +504,25 @@ const handleConversionCodeValue = (item, label, Arr) => {
item[label + 'Name'] = _index !== -1 ? Arr[_index].label : '未知';
};
/** 输入框赋值 */
const handleSetOption = (label, Arr) => {
for (const iterator of details.columnList) {
if (iterator.prop === label + 'Name') {
iterator.checkarr = Arr;
break;
}
}
};
onMounted(() => {
//
handleSetOption('payMethod', details.payMethodOptions);
handleSetOption('loadStatus', details.loadStatusOptions);
handleSetOption('isSettlement', details.isSettlementOptions);
handleSetOption('customerType', details.customerTypeOptions);
handleSetOption('deliveryType', details.deliveryTypeOptions);
});
/** 请求页面数据 */
const onLoad = async (params = {}) => {
try {
@ -770,7 +530,11 @@ const onLoad = async (params = {}) => {
details.loadingObj.list = true;
//
const res = await postTripartiteTransferPageList(details.page, { ...details.query, ...params });
const res = await postTripartiteTransferPageList({
...details.page,
...details.query,
...params,
});
const { code, data } = res.data;
if (code !== 200) return;
details.data = data.records;
@ -794,7 +558,7 @@ onLoad();
/** 搜索 */
const searchChange = () => {
onLoad(details.page);
onLoad();
};
/** 清空表单 */
@ -802,7 +566,7 @@ const searchReset = () => {
details.query = {};
details.stockupDate = [];
details.page.pageNum = 1;
onLoad(details.page);
onLoad();
};
/** 展开列表控件 */
@ -845,7 +609,7 @@ const searchHide = () => {
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
details.query[row.prop] = index;
onLoad(details.page);
onLoad();
};
/** 表格表头时间选择 */
@ -858,7 +622,7 @@ const timesc = (index, row) => {
if (!index) {
delete details.query[row.prop];
}
onLoad(details.page);
onLoad();
};
/** 表格表头输入框搜索 */
@ -866,13 +630,12 @@ const btnsc = () => {};
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
details.query[row.prop] = index;
if (!index) delete details.query[row.prop];
if (row.prop === 'certificateTypeName') {
details.query['certificateType'] = index;
if (!index) delete details.query['certificateType'];
}
onLoad(details.page);
const _name = row.prop.replace('Name', '');
details.query[_name] = index;
if (!index) delete details.query[_name];
onLoad();
};
/** 表格表头复选框选择 */
@ -881,48 +644,10 @@ const selectionChange = (list: any) => {
details.selectionList = list;
};
/** 表格表头输入框搜索 */
const newInputsc = (index, row) => {
details.newQuery[row.prop] = index;
onLoad(details.page);
};
/** 表格表头时间选择 */
const newTimesc = (index, row) => {
console.log(index, row);
if (!!index) {
index = dayjs(index).format('YYYY-MM-DD');
}
details.newQuery[row.prop] = index;
if (!index) {
delete details.newQuery[row.prop];
}
onLoad(details.page);
};
/** 表格表头输入框搜索 */
const newBtnsc = () => {};
/** 表格表头下拉框选择 */
const newSelectsc = (index, row) => {
details.newQuery[row.prop] = index;
if (!index) delete details.newQuery[row.prop];
if (row.prop === 'certificateTypeName') {
details.newQuery['certificateType'] = index;
if (!index) delete details.newQuery['certificateType'];
}
onLoad(details.page);
};
/** 表格表头复选框选择 */
const newSelectionChange = (list: any) => {
details.newSelectionList = list;
};
/** 每页数量改变执行的回调 */
const sizeChange = (pageSize: number) => {
details.page.pageSize = pageSize;
onLoad(details.page);
onLoad();
};
/** 页码改变执行的回调 */
@ -954,16 +679,7 @@ const beforeClose = done => {
};
/** 显示装车详情 */
const handleShowTruckLoadingDetails = ({ row }) => {
details.popUpShow.truckLoadingDetailVisited = true;
nextTick(() => {
// ,
const _node = document.querySelector('.truckLoadingDetailPopUp .maboxhi');
_node.style.height = '550px';
console.log('_node :>> ', _node);
});
};
const handleShowTruckLoadingDetails = ({ row }) => {};
/** 跳转零担补录 */
const handleShowzeroAdditionalRecording = ({ row }) => {
@ -1001,26 +717,6 @@ const handleShowTransfer = async (_type: string) => {
default:
break;
}
// details.popUpShow.transferVisited = true;
// nextTick(() => {
// // ,
// const _nodeList = document.querySelectorAll('.transferPopUp .maboxhi');
// _nodeList.forEach(val => (val.style.height = '300px'));
// });
};
/** 添加运单 */
const handleAddWaybill = () => {
// if (this.addInfo.oldSelectionList.length === 0) return this.$message.warning('');
// this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList];
// this.addInfo.haveIds = this.addInfo.map(val => val.id);
};
/** 移除运单 */
const handleRemoveWaybill = () => {
// if (this.addInfo.newSelectionList.length === 0) return this.$message.warning('');
// this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList];
// this.addInfo.haveIds = this.addInfo.map(val => val.id);
};
/** 开启到达弹窗 */

441
src/views/distribution/artery/VehicleArrivalManagement.vue

@ -83,7 +83,7 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-van" @click="searchChange">发车 </el-button>
<el-button type="primary" icon="el-icon-van" @click="handleStartCar">发车 </el-button>
<el-button type="primary" icon="el-icon-close" @click="searchReset()"
>网点取消发车</el-button
>
@ -233,86 +233,116 @@
</div>
</basic-container>
<!-- 装车详情弹窗 -->
<!-- 配置装车目的地 -->
<el-dialog
title="装车明细"
title="配置装车目的地"
v-model="details.popUpShow.truckLoadingDetailVisited"
width="80%"
:before-close="beforeClose"
append-to-body
:fullscreen="details.fullscreenObj.truckLoadingDetailPopUp"
:show-close="false"
class="truckLoadingDetailPopUp"
v-loading="details.loadingObj.truckLoadingDetailPopUpTable"
>
<el-form :inline="true" :model="query" class="el-fr-d">
<div class="fo-fl">
<el-form-item label="预计发车:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item label="实际发车:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-van" @click="searchChange">批量卸车</el-button>
<el-button type="primary" icon="el-icon-search" @click="searchReset()"> </el-button>
<el-button icon="el-icon-printer" @click="searchReset()">二维码</el-button>
</el-form-item>
<!-- 标题 -- 头部控件区 -->
<template #header="{ close, titleId, titleClass }">
<div class="my-header flex-c-sb">
<div class="fwb" :id="titleId" :class="titleClass">配置装车目的地</div>
<div class="flex-c-c">
<!-- 全屏显示按钮 -->
<el-button type="text" v-if="!details.fullscreenObj.truckLoadingDetailPopUp">
<el-icon class="" @click="handleFullScrean('open', 'truckLoadingDetailPopUp')"
><FullScreen
/></el-icon>
</el-button>
<el-button type="text" v-else>
<el-icon class="" @click="handleFullScrean('close', 'truckLoadingDetailPopUp')"
><CopyDocument
/></el-icon>
</el-button>
<!-- 弹窗关闭按钮 -->
<el-button type="text">
<el-icon class="" @click="close"><Close /></el-icon>
</el-button>
</div>
</div>
</template>
<div v-loading="details.loadingObj.truckLoadingDetailPopUpLoading">
<el-button
icon="Edit"
type="primary"
v-if="details.nextNodeData.length > 1"
@click="handleOpenConfiguration('batch')"
>
配置目的地
</el-button>
<tablecmt
class="truckLoadingDetailPopUpTable mt10"
:columnList="details.packageColumnList"
:tableData="details.packageRenderData"
:loading="loadingObj.list"
@inputTxt="packageInputsc"
@selection="list => (details.packageSelectedData = list)"
>
<template #default="slotProps">
<el-text
v-if="details.nextNodeData.length > 1"
@click="handleOpenConfiguration('one', slotProps.scope)"
>配置目的地</el-text
>
<el-text @click="removePackage(slotProps.scope)">移除</el-text>
</template>
</tablecmt>
<div class="dialog-footer">
<el-button
icon="el-icon-circle-close"
@click="details.popUpShow.truckLoadingDetailVisited = false"
> </el-button
>
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
> </el-button
>
</div>
</el-form>
<tablecmt
:columnList="details.detailsColumnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps"> </template>
</tablecmt>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="trickleLoadingPage.pageNum"
:page-sizes="[30, 50, 80, 120]"
:page-size="trickleLoadingPage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="trickleLoadingPage.total"
>
</el-pagination>
</div>
</el-dialog>
<!-- 配置装车目的地 -->
<el-dialog
title="配置装车目的地"
v-model="details.popUpShow.chooseDestinationVisited"
width="30%"
append-to-body
class="truckLoadingDetailPopUp"
>
<el-form-item label="目的地" prop="region">
<el-select v-model="details.chooseNodeId" placeholder="请选择目的地" class="w100">
<el-option
v-for="item in details.nextNodeData"
:key="item"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- 表单按钮 -->
<!-- <template #footer>
<div v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit"
> </el-button
<template #footer>
<div class="dialog-footer">
<el-button
icon="el-icon-circle-close"
@click="details.popUpShow.chooseDestinationVisited = false"
> </el-button
>
<el-button icon="el-icon-circle-close" @click="box = false"> </el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit">
</el-button>
</div>
</template> -->
</template>
</el-dialog>
<!-- 列表配置显示 -->
@ -331,13 +361,21 @@ import dayjs from 'dayjs';
import { mapGetters } from 'vuex';
/** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict';
import { downloadXls } from '@/utils/util';
import { columnList, detailsColumnList } from '@/option/distribution/VehicleArrivalManagement';
import { downloadXls, deepClone, setNodeHeight } from '@/utils/util';
import { columnList } from '@/option/distribution/VehicleArrivalManagement';
import { packageColumnList } from '@/option/distribution/VehicleStowage';
import {
postloadArriveCarsPageList,
postloadArriveCarByLoadId,
postloadCancelArriveCarByLoadId,
} from '@/api/distribution/VehicleArrivalManagement';
import {
postStartCarByLoadId,
postDetermineHasNoFinalNode,
postFindNextNodeList,
postUpdateLoadScanFinalNodeIdById,
postRemoveCarsLoadScan,
} from '@/api/distribution/VehicleStowage';
import { useRouter } from 'vue-router';
import { ElMessage, ElMessageBox } from 'element-plus';
@ -387,13 +425,14 @@ const details = reactive({
stockupDate: [],
/** 列表 */
columnList,
detailsColumnList,
/** 列表数据 */
data: [],
/** 页面loading */
loadingObj: {
/** 列表加载loading */
list: false,
/** 配置装车目的地详情 */
truckLoadingDetailPopUpLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
@ -405,59 +444,64 @@ const details = reactive({
pageSize: 30,
total: 0,
},
/** 装车明细分页参数 */
trickleLoadingPage: {
pageNum: 1,
pageSize: 30,
total: 0,
},
/** 列表Dom节点 */
listNode: '',
/** 弹出层显示 */
popUpShow: {
/** 装车详情 */
/** 配置目的地 */
truckLoadingDetailVisited: false,
/** 选择目的地弹窗 */
chooseDestinationVisited: false,
},
/** 全屏 */
fullscreenObj: {
/** 装车明细 */
truckLoadingDetailPopUp: false,
comparativeStatementPopUp: false,
},
/** 弹出层表单 */
form: {},
/** 是否为查看模式 */
view: false,
/** 车辆状态 */
carsStatus: [
{ value: 0, label: '未车' },
{ value: 10, label: '已车' },
{ value: 0, label: '未车' },
{ value: 10, label: '已车' },
{ value: 20, label: '网点到车' },
{ value: 30, label: '网点发车' },
{ value: 40, label: '终点到车' },
{ value: 100, label: '取消配载' },
],
packageColumnList: deepClone(packageColumnList),
/** 配置装车目的地数据 */
packageData: [],
/** 配置装车目的地数据 -- 渲染数据 */
packageRenderData: [],
/** 后续装车目的地 */
nextNodeData: [],
/** 配置目的地 -- 被选中的数据 */
packageSelectedData: [],
/** 被修改的数据 */
modifyData: [],
/** 被选中的数据 */
chooseNodeId: '',
packageQuery: {},
});
const {
search,
query,
shortcuts,
stockupDate,
data,
loadingObj,
selectionList,
drawerShow,
page,
trickleLoadingPage,
} = toRefs(details);
const { search, query, shortcuts, stockupDate, data, loadingObj, selectionList, drawerShow, page } =
toRefs(details);
/** vuex */
const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
console.log('permission :>> ', permission);
onMounted(() => {
const timer = setTimeout(() => {
details.listNode = document.querySelector('.maboxhi') as any;
details.listNode.style.transition = 'all .5s ease-out';
console.log('details.listNode :>> ', details.listNode);
clearTimeout(timer);
}, 100);
// const timer = setTimeout(() => {
// details.listNode = document.querySelector('.maboxhi') as any;
// details.listNode.style.transition = 'all .5s ease-out';
// console.log('details.listNode :>> ', details.listNode);
// clearTimeout(timer);
// }, 100);
});
/** 请求页面数据 */
@ -626,6 +670,8 @@ const handleShowComparativeStatement = () => {
/** 到车 */
const handleArrive = async () => {
if (details.selectionList.length == 0) return ElMessage.warning('请选择需要到车的数据');
console.log(
'details.selectionList.map(val => val.id) :>> ',
details.selectionList.map(val => val.id)
@ -691,6 +737,201 @@ const handleGoWaybill = ({ row }) => {
},
});
};
/**
* 是否开启床车明细全屏
* @params(_type) 开启或关闭
*/
const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
let _node = '';
if (_name) _node = document.querySelectorAll(`.${_name} .maboxhi`);
console.log('_node :>> ', _node);
switch (_name) {
case 'comparativeStatementPopUp':
details.fullscreenObj.comparativeStatementPopUp =
!details.fullscreenObj.comparativeStatementPopUp;
break;
default:
details.fullscreenObj[_name] = !details.fullscreenObj[_name];
if (_type === 'close') {
if (_node) setNodeHeight(_node, '500px');
} else {
if (_node) setNodeHeight(_node);
}
break;
}
};
/** 初始化请求数据 */
const init = async item => {
const res = await postFindNextNodeList({ loadId: item.id });
//
const { code, data } = res.data;
if (code !== 200) return;
details.nextNodeData = data || [];
if (details.nextNodeData.length !== 1) return;
for (const iterator of details.packageData) {
iterator.nodeName = details.nextNodeData[0].warehouseName;
iterator.nodeId = details.nextNodeData[0].warehouseId;
}
};
/** 发车 */
const handleStartCar = async () => {
if (details.selectionList.length === 0) {
return ElMessage({
message: '请选择发车数据',
type: 'warning',
});
} else if (details.selectionList.length !== 1) {
return ElMessage({
message: '仅支持单条数据操作',
type: 'warning',
});
}
//
const res = await postDetermineHasNoFinalNode({ loadId: details.selectionList[0].id });
const { code, data } = res.data;
if (code !== 200) return;
// data
if (data) {
details.popUpShow.truckLoadingDetailVisited = true;
details.packageData = data || [];
details.packageRenderData = details.packageData;
//
const _item = details.selectionList[0];
init(_item);
await nextTick();
const _node = document.querySelector('.truckLoadingDetailPopUpTable');
setNodeHeight(_node, '500px');
} else {
details.popUpShow.truckLoadingDetailVisited = false;
ElMessageBox.confirm('确认发车吗?', '', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
const submitData = {
loadId: details.selectionList.map(val => val.id).join(','),
startCarType: '1',
};
const res = await postStartCarByLoadId(submitData);
const { code } = res.data;
if (code !== 200) {
return;
}
ElMessage({
type: 'success',
message: '发车成功',
});
onLoad();
});
}
};
/** 开启弹窗 */
const handleOpenConfiguration = (type: 'one' | 'batch', data) => {
if (type === 'batch' && details.packageSelectedData.length === 0)
return ElMessage.warning('最少选择一条数据');
details.modifyData = type === 'one' ? [data.row] : details.packageSelectedData;
details.popUpShow.chooseDestinationVisited = true;
};
/** 配置装车目的地 */
const handleEditSubmit = () => {
const chooseItem = details.nextNodeData.find(val => val.warehouseId === details.chooseNodeId);
for (const iterator of details.modifyData) {
iterator.nodeName = chooseItem.warehouseName;
iterator.nodeId = chooseItem.warehouseId;
}
details.popUpShow.chooseDestinationVisited = false;
};
/** 移除 */
const removePackage = async ({ row }) => {
try {
details.loadingObj.truckLoadingDetailPopUpLoading = true;
const submitData = {
orderCode: row.orderCode,
carsLoadScanId: row.id,
};
const res = await postRemoveCarsLoadScan(submitData);
if (res.data.code !== 200) return;
await handleStartCar();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.truckLoadingDetailPopUpLoading = false;
}
};
/** 确认配置 */
const handleSubmit = async () => {
details.loadingObj.truckLoadingDetailPopUpLoading = true;
try {
const submitData = {
loadId: details.selectionList[0].id,
loadScanFinalNodeIdList: [],
};
details.packageData.forEach(val => {
if (val.nodeId)
submitData.loadScanFinalNodeIdList.push({ loadScanId: val.id, finalNodeId: val.nodeId });
});
const res = await postUpdateLoadScanFinalNodeIdById(submitData);
if (res.data.code !== 200) return;
details.popUpShow.truckLoadingDetailVisited = false;
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.truckLoadingDetailPopUpLoading = false;
}
};
/** 输入筛选 */
const packageInputsc = (value, row) => {
//
const reg = new RegExp(value, 'i');
details.packageQuery[row.prop] = reg;
if (value === '') delete details.packageQuery[row.prop];
if (Object.keys(details.packageQuery).length === 0)
return (details.packageRenderData = details.packageData);
const _data = details.packageData.filter(item => {
let _flag = true;
for (let key in details.packageQuery) {
if (!details.packageQuery[key].test(item[key])) _flag = false;
if (!_flag) break;
}
return _flag;
});
details.packageRenderData = _data;
};
</script>
<style scoped lang="scss">

299
src/views/distribution/artery/VehicleStowage.vue

@ -129,20 +129,18 @@
<span>{{ item.nodeName }}</span>
</div>
<div>
<span class="mr-10">运单总件数:</span>
<span>{{ item.nodeName }}</span>
</div>
<div>
<span class="mr-10">实际装车件数:</span>
<span>{{ item.nodeName }}</span>
<span class="mr-10">装车件数:</span>
<span>{{ item.realLoadingNumber || 0 }}</span>
</div>
<div>
<span class="mr-10">操作人:</span>
<span>{{ item.nodeName }}</span>
<span>{{ item.arriveUserName || item.startUserName || '暂无数据' }}</span>
</div>
<div>
<span class="mr-10">状态:</span>
<span>{{ item.nodeName }}</span>
<span>{{
loadStatus.find(val => val.code === Number(item.nodeStatus)).label
}}</span>
</div>
</template>
<el-text>{{ item.nodeName }}</el-text>
@ -226,10 +224,12 @@
:fullscreen="details.fullscreenObj.truckLoadingDetailPopUp"
:show-close="false"
class="truckLoadingDetailPopUp"
v-loading="details.loadingObj.truckLoadingDetailPopUpTable"
>
<!-- 标题 -- 头部控件区 -->
<template #header="{ close, titleId, titleClass }">
<div class="my-header flex-c-sb">
<h4 :id="titleId" :class="titleClass">配置装车目的地</h4>
<div class="fwb" :id="titleId" :class="titleClass">配置装车目的地</div>
<div class="flex-c-c">
<!-- 全屏显示按钮 -->
<el-button type="text" v-if="!details.fullscreenObj.truckLoadingDetailPopUp">
@ -251,42 +251,79 @@
</div>
</template>
<tablecmt
:columnList="details.detailsColumnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps"> </template>
</tablecmt>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="trickleLoadingPage.pageNum"
:page-sizes="[30, 50, 80, 120]"
:page-size="trickleLoadingPage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="trickleLoadingPage.total"
>
</el-pagination>
<div v-loading="details.loadingObj.truckLoadingDetailPopUpLoading">
<el-button
icon="Edit"
type="primary"
v-if="details.nextNodeData.length > 1"
@click="handleOpenConfiguration('batch')"
>
配置目的地
</el-button>
<!-- 表单按钮 -->
<!-- <template #footer>
<div v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit"
<tablecmt
class="truckLoadingDetailPopUpTable mt10"
:columnList="details.packageColumnList"
:tableData="details.packageRenderData"
:loading="loadingObj.list"
@inputTxt="packageInputsc"
@selection="list => (details.packageSelectedData = list)"
>
<template #default="slotProps">
<el-text
v-if="details.nextNodeData.length > 1"
@click="handleOpenConfiguration('one', slotProps.scope)"
>配置目的地</el-text
>
<el-text @click="removePackage(slotProps.scope)">移除</el-text>
</template>
</tablecmt>
<div class="dialog-footer">
<el-button
icon="el-icon-circle-close"
@click="details.popUpShow.truckLoadingDetailVisited = false"
> </el-button
>
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
> </el-button
>
<el-button icon="el-icon-circle-close" @click="box = false"> </el-button>
</div>
</template> -->
</div>
</el-dialog>
<!-- 配置装车目的地 -->
<el-dialog
title="配置装车目的地"
v-model="details.popUpShow.chooseDestinationVisited"
width="30%"
append-to-body
class="truckLoadingDetailPopUp"
>
<el-form-item label="目的地" prop="region">
<el-select v-model="details.chooseNodeId" placeholder="请选择目的地" class="w100">
<el-option
v-for="item in details.nextNodeData"
:key="item"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- 表单按钮 -->
<template #footer>
<div class="dialog-footer">
<el-button
icon="el-icon-circle-close"
@click="details.popUpShow.chooseDestinationVisited = false"
> </el-button
>
<el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit">
</el-button>
</div>
</template>
</el-dialog>
<!-- 列表配置显示 -->
@ -294,7 +331,7 @@
@setcolum="setnewcolum"
@closce="showdrawer"
:drawerShow="drawerShow"
:columnList="columnList"
:columnList="details.columnList"
></edittablehead>
</template>
@ -306,13 +343,16 @@ import { mapGetters } from 'vuex';
/** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict';
import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
import { columnList, detailsColumnList } from '@/option/distribution/VehicleStowage';
import { columnList, packageColumnList } from '@/option/distribution/VehicleStowage';
import {
postloadCarsPageList,
postStartCarByLoadId,
postCancelStartCarByLoadId,
postCancelCarsLoadByLoadId,
postDetermineHasNoFinalNode,
postFindNextNodeList,
postUpdateLoadScanFinalNodeIdById,
postRemoveCarsLoadScan,
} from '@/api/distribution/VehicleStowage';
import { useStore } from 'vuex';
import { useRouter } from 'vue-router';
@ -368,14 +408,14 @@ const details = reactive<any>({
stockupDate: [],
/** 列表 */
columnList,
detailsColumnList,
/** 列表数据 */
data: [],
/** 页面loading */
loadingObj: {
/** 列表加载loading */
list: false,
oldListLoading: false,
/** 配置装车目的地详情 */
truckLoadingDetailPopUpLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
@ -387,20 +427,14 @@ const details = reactive<any>({
pageSize: 30,
total: 0,
},
/** 装车明细分页参数 */
trickleLoadingPage: {
pageNum: 1,
pageSize: 30,
total: 0,
},
/** 弹出层显示 */
popUpShow: {
/** 装车详情 */
/** 配置目的地 */
truckLoadingDetailVisited: false,
/** 零担补录 */
zeroAdditionalRecordingVisited: false,
/** 对比报表 */
comparativeStatementPopUp: false,
/** 选择目的地弹窗 */
chooseDestinationVisited: false,
},
/** 列表Dom节点 */
listNode: '',
@ -411,6 +445,20 @@ const details = reactive<any>({
truckLoadingDetailPopUp: false,
comparativeStatementPopUp: false,
},
packageColumnList,
/** 配置装车目的地数据 */
packageData: [],
/** 配置装车目的地数据 -- 渲染数据 */
packageRenderData: [],
/** 后续装车目的地 */
nextNodeData: [],
/** 配置目的地 -- 被选中的数据 */
packageSelectedData: [],
/** 被修改的数据 */
modifyData: [],
/** 被选中的数据 */
chooseNodeId: '',
packageQuery: {},
});
/** 车辆状态字典 */
@ -423,6 +471,12 @@ const carStateDictionaries = reactive([
{ label: '取消配载', code: 100 },
]);
const loadStatus = reactive([
{ label: '未到达', code: 0 },
{ label: '已到车', code: 10 },
{ label: '已发车', code: 20 },
]);
const {
search,
query,
@ -433,7 +487,6 @@ const {
selectionList,
drawerShow,
page,
trickleLoadingPage,
popUpShow,
} = toRefs(details);
@ -547,6 +600,22 @@ const onLoad = async (params = {}) => {
};
onLoad();
/** 初始化请求数据 */
const init = async item => {
const res = await postFindNextNodeList({ loadId: item.id });
//
const { code, data } = res.data;
if (code !== 200) return;
details.nextNodeData = data || [];
if (details.nextNodeData.length !== 1) return;
for (const iterator of details.packageData) {
iterator.nodeName = details.nextNodeData[0].warehouseName;
iterator.nodeId = details.nextNodeData[0].warehouseId;
}
};
/** 搜索 */
const searchChange = () => {
@ -795,13 +864,20 @@ const handleStartCar = async () => {
// data
if (data) {
details.popUpShow.truckLoadingDetailVisited = true;
// $router.push({
// path: '/distribution/artery/handleLoadingDestination',
// query: {
// loadId: details.selectionList[0].id,
// },
// });
details.packageData = data || [];
details.packageRenderData = details.packageData;
//
const _item = details.selectionList[0];
init(_item);
await nextTick();
const _node = document.querySelector('.truckLoadingDetailPopUpTable');
setNodeHeight(_node, '500px');
} else {
details.popUpShow.truckLoadingDetailVisited = false;
ElMessageBox.confirm('确认发车吗?', '', {
confirmButtonText: '确认',
cancelButtonText: '取消',
@ -827,6 +903,97 @@ const handleStartCar = async () => {
}
};
/** 开启弹窗 */
const handleOpenConfiguration = (type: 'one' | 'batch', data) => {
if (type === 'batch' && details.packageSelectedData.length === 0)
return ElMessage.warning('最少选择一条数据');
details.modifyData = type === 'one' ? [data.row] : details.packageSelectedData;
details.popUpShow.chooseDestinationVisited = true;
};
/** 配置装车目的地 */
const handleEditSubmit = () => {
const chooseItem = details.nextNodeData.find(val => val.warehouseId === details.chooseNodeId);
for (const iterator of details.modifyData) {
iterator.nodeName = chooseItem.warehouseName;
iterator.nodeId = chooseItem.warehouseId;
}
details.popUpShow.chooseDestinationVisited = false;
};
/** 移除 */
const removePackage = async ({ row }) => {
try {
details.loadingObj.truckLoadingDetailPopUpLoading = true;
const submitData = {
orderCode: row.orderCode,
carsLoadScanId: row.id,
};
const res = await postRemoveCarsLoadScan(submitData);
if (res.data.code !== 200) return;
await handleStartCar();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.truckLoadingDetailPopUpLoading = false;
}
};
/** 确认配置 */
const handleSubmit = async () => {
details.loadingObj.truckLoadingDetailPopUpLoading = true;
try {
const submitData = {
loadId: details.selectionList[0].id,
loadScanFinalNodeIdList: [],
};
details.packageData.forEach(val => {
if (val.nodeId)
submitData.loadScanFinalNodeIdList.push({ loadScanId: val.id, finalNodeId: val.nodeId });
});
const res = await postUpdateLoadScanFinalNodeIdById(submitData);
if (res.data.code !== 200) return;
details.popUpShow.truckLoadingDetailVisited = false;
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.truckLoadingDetailPopUpLoading = false;
}
};
/** 输入筛选 */
const packageInputsc = (value, row) => {
//
const reg = new RegExp(value, 'i');
details.packageQuery[row.prop] = reg;
if (value === '') delete details.packageQuery[row.prop];
if (Object.keys(details.packageQuery).length === 0)
return (details.packageRenderData = details.packageData);
const _data = details.packageData.filter(item => {
let _flag = true;
for (let key in details.packageQuery) {
if (!details.packageQuery[key].test(item[key])) _flag = false;
if (!_flag) break;
}
return _flag;
});
details.packageRenderData = _data;
};
/** 取消发车 */
const handleCancelStartCar = () => {
if (details.selectionList.length === 0) {
@ -970,4 +1137,14 @@ const handleCancelCarsLoad = () => {
.mr-10 {
margin-right: 10px;
}
//
.dialog-footer {
margin-top: 10px;
text-align: center;
}
.w100 {
width: 100%;
}
</style>

42
src/views/distribution/artery/handleLoadingDestination.vue

@ -54,32 +54,28 @@
append-to-body
class="truckLoadingDetailPopUp"
>
<el-form
ref="ruleFormRef"
:model="ruleForm"
:rules="rules"
label-width="120px"
class="demo-ruleForm"
status-icon
>
<el-form-item label="Activity name" prop="name">
<el-input v-model="ruleForm.name" />
</el-form-item>
<el-form-item label="Activity zone" prop="region">
<el-select v-model="ruleForm.region" placeholder="Activity zone">
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
</el-form>
<el-form-item label="目的地" prop="region">
<el-select v-model="details.chooseNodeId" placeholder="Activity zone">
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
<!-- 表单按钮 -->
<template #footer>
<div class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit(ruleFormRef)"
> </el-button
<el-button
icon="el-icon-circle-close"
@click="details.popUpShow.truckLoadingDetailVisited = false"
> </el-button
>
<el-button
type="primary"
icon="el-icon-circle-check"
@click="handleEditSubmit(ruleFormRef)"
>
<el-button icon="el-icon-circle-close" @click="box = false"> </el-button>
</el-button>
</div>
</template>
</el-dialog>
@ -161,6 +157,7 @@ const details = reactive<any>({
selectionList: [],
/** 后续节点数据 */
nextNodeData: [],
chooseNodeId: '',
});
/** 初始化请求数据 */
@ -276,6 +273,9 @@ const handleBratchConfiguration = () => {
const handleConfiguration = ({ row }) => {
details.popUpShow.truckLoadingDetailVisited = true;
};
/** 配置装车 */
const handleEditSubmit = () => {};
</script>
<style scoped lang="scss">

Loading…
Cancel
Save