|
|
|
|
@ -244,6 +244,7 @@
|
|
|
|
|
:tableData="details.nodeInfoData" |
|
|
|
|
:loading="loadingObj.stowageLoading" |
|
|
|
|
ref="nodeInfoRef" |
|
|
|
|
:isShowRefresh="false" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-input-number |
|
|
|
|
@ -279,7 +280,7 @@
|
|
|
|
|
</el-divider> |
|
|
|
|
|
|
|
|
|
<!-- 搜索区域 --> |
|
|
|
|
<div v-if="!search"> |
|
|
|
|
<div v-h5uShow="!search"> |
|
|
|
|
<el-form |
|
|
|
|
:inline="true" |
|
|
|
|
label-width="80px" |
|
|
|
|
@ -389,7 +390,7 @@
|
|
|
|
|
</el-divider> |
|
|
|
|
|
|
|
|
|
<!-- 搜索区域 --> |
|
|
|
|
<div v-if="!search"> |
|
|
|
|
<div v-h5uShow="!search"> |
|
|
|
|
<el-form |
|
|
|
|
:inline="true" |
|
|
|
|
label-width="80px" |
|
|
|
|
@ -447,7 +448,11 @@
|
|
|
|
|
|
|
|
|
|
<!-- 展开搜索和刷新 --> |
|
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button> |
|
|
|
|
<el-button |
|
|
|
|
icon="el-icon-refresh" |
|
|
|
|
@click="handleNewDataRefresh(item)" |
|
|
|
|
circle |
|
|
|
|
></el-button> |
|
|
|
|
<el-button icon="el-icon-search" @click="searchHide" circle></el-button> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
@ -463,7 +468,6 @@
|
|
|
|
|
@selection="list => item.selectionChange(list, index)" |
|
|
|
|
:isselectfun=" |
|
|
|
|
row => { |
|
|
|
|
console.log(row); |
|
|
|
|
return !Boolean(row.realNum); |
|
|
|
|
} |
|
|
|
|
" |
|
|
|
|
@ -574,7 +578,14 @@ import dayjs from 'dayjs';
|
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
/** 获取字典 */ |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import { downloadXls, setNodeHeight, computeNumber, isNumber, deepClone } from '@/utils/util'; |
|
|
|
|
import { |
|
|
|
|
downloadXls, |
|
|
|
|
setNodeHeight, |
|
|
|
|
computeNumber, |
|
|
|
|
isNumber, |
|
|
|
|
deepClone, |
|
|
|
|
debounce, |
|
|
|
|
} from '@/utils/util'; |
|
|
|
|
import { |
|
|
|
|
columnList, |
|
|
|
|
nodeInfoColumnList, |
|
|
|
|
@ -616,8 +627,6 @@ const ruleFormRef = ref();
|
|
|
|
|
// 节点下拉框实例 |
|
|
|
|
const selectNodeRef = ref(); |
|
|
|
|
|
|
|
|
|
console.log('ruleFormRef :>> ', ruleFormRef); |
|
|
|
|
|
|
|
|
|
// 获取用户信息 |
|
|
|
|
const userInfo = computed(() => $store.state.user.userInfo); |
|
|
|
|
|
|
|
|
|
@ -810,7 +819,6 @@ const newColumnListNode = ref();
|
|
|
|
|
|
|
|
|
|
/** vuex */ |
|
|
|
|
const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList'])); |
|
|
|
|
console.log('permission :>> ', permission); |
|
|
|
|
|
|
|
|
|
/** 设置页面表格高度 */ |
|
|
|
|
const setTabelHeight = async () => { |
|
|
|
|
@ -819,13 +827,9 @@ const setTabelHeight = async () => {
|
|
|
|
|
|
|
|
|
|
const _listNode = document.querySelectorAll('.columnList.maboxhi'); |
|
|
|
|
|
|
|
|
|
console.log('nodeInfoRef.value.$el :>> ', nodeInfoRef.value.$el); |
|
|
|
|
|
|
|
|
|
// 节点信息列表高度 |
|
|
|
|
setNodeHeight(nodeInfoRef.value.$el, 'auto'); |
|
|
|
|
|
|
|
|
|
console.log('_listNode :>> ', _listNode); |
|
|
|
|
|
|
|
|
|
if (_listNode.length === 0) return; |
|
|
|
|
setNodeHeight(_listNode, '55vh'); |
|
|
|
|
}; |
|
|
|
|
@ -838,10 +842,7 @@ onMounted(() => {
|
|
|
|
|
// 清空复选框 |
|
|
|
|
const clearSelectionList = () => { |
|
|
|
|
details.selectionList = []; |
|
|
|
|
console.log('newColumnListNode :>> ', newColumnListNode); |
|
|
|
|
console.log('oldColumnListNode :>> ', oldColumnListNode); |
|
|
|
|
newColumnListNode.value.forEach(val => { |
|
|
|
|
console.log('val :>> ', val); |
|
|
|
|
val.handleCheckSelect([]); |
|
|
|
|
}); |
|
|
|
|
oldColumnListNode.value.forEach(val => { |
|
|
|
|
@ -872,7 +873,7 @@ const handleEditForbidden = (_arr: any[]) => {
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 请求运单数据 */ |
|
|
|
|
const initOriginWarehouseOrder = async (params = {}) => { |
|
|
|
|
const initOriginWarehouseOrder = debounce(async (params = {}) => { |
|
|
|
|
try { |
|
|
|
|
details.loadingObj.oldListLoading = true; |
|
|
|
|
const submitData = { |
|
|
|
|
@ -884,7 +885,6 @@ const initOriginWarehouseOrder = async (params = {}) => {
|
|
|
|
|
if (Number(details.pageType) === 2) submitData.loadId = details.loadId; |
|
|
|
|
if (submitData.orderCodes.length === 0) delete submitData.orderCodes; |
|
|
|
|
const res = await postFindAllOrderList(submitData); |
|
|
|
|
console.log('res :>> ', res); |
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
details.data = data.records; |
|
|
|
|
@ -894,7 +894,7 @@ const initOriginWarehouseOrder = async (params = {}) => {
|
|
|
|
|
} finally { |
|
|
|
|
details.loadingObj.oldListLoading = false; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
}, 100); |
|
|
|
|
|
|
|
|
|
/** 请求添加在调度池中的数据 */ |
|
|
|
|
const initDispatchOrder = async item => { |
|
|
|
|
@ -943,7 +943,6 @@ const onLoad = async () => {
|
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
details.pageInfo = data; |
|
|
|
|
console.log('data.startWarehouseInfo.nodeName :>> ', data.startWarehouseInfo.nodeName); |
|
|
|
|
details.nodeInfoData = [ |
|
|
|
|
{ |
|
|
|
|
nodeName: data.startWarehouseInfo.warehouseName, |
|
|
|
|
@ -954,15 +953,12 @@ const onLoad = async () => {
|
|
|
|
|
}, |
|
|
|
|
]; |
|
|
|
|
details.nodeInfoData = handleEditForbidden(details.nodeInfoData); |
|
|
|
|
console.log('details.nodeInfoData :>> ', details.nodeInfoData); |
|
|
|
|
details.form.startWarehouseName = data.startWarehouseInfo.warehouseName; |
|
|
|
|
details.form.startWarehouseId = data.startWarehouseInfo.warehouseId; |
|
|
|
|
} |
|
|
|
|
// 编辑 |
|
|
|
|
else { |
|
|
|
|
console.log('222 :>> ', 222); |
|
|
|
|
const res = await postSelectEditDetailByLoadId({ loadId: details.loadId }); |
|
|
|
|
console.log('res :>> ', res); |
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
|
|
|
|
|
@ -987,11 +983,8 @@ const onLoad = async () => {
|
|
|
|
|
loading: false, |
|
|
|
|
selectionChange(list, index) { |
|
|
|
|
details.nodeInfoData[index].selectionList = list; |
|
|
|
|
console.log('list :>> ', list); |
|
|
|
|
}, |
|
|
|
|
itemInputsc(value, row, index) { |
|
|
|
|
console.log('this :>> ', this); |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
// 动态设置正则 |
|
|
|
|
const reg = new RegExp(value, 'i'); |
|
|
|
|
@ -1060,7 +1053,6 @@ const remoteMethod = async val => {
|
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
details.options = data; |
|
|
|
|
console.log('res :>> ', res); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
remoteMethod(''); |
|
|
|
|
@ -1101,14 +1093,12 @@ const searchHide = () => {
|
|
|
|
|
/** 表格表头输入框搜索 */ |
|
|
|
|
const inputsc = (index, row) => { |
|
|
|
|
details.query[row.prop] = index; |
|
|
|
|
console.log('111 :>> ', 111); |
|
|
|
|
if (index === '') delete details.query[row.prop]; |
|
|
|
|
initOriginWarehouseOrder(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 表格表头时间选择 */ |
|
|
|
|
const timesc = (index, row) => { |
|
|
|
|
console.log(index, row); |
|
|
|
|
if (!!index) { |
|
|
|
|
index = dayjs(index).format('YYYY-MM-DD'); |
|
|
|
|
} |
|
|
|
|
@ -1168,6 +1158,22 @@ const setnewcolum = (newarr, headarr, type) => {
|
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
const handleNewDataRefresh = item => { |
|
|
|
|
for (let index = 0; index < item.lineCarsOrderList.length; index++) { |
|
|
|
|
const iterator = item.lineCarsOrderList[index]; |
|
|
|
|
const _code = iterator.orderCode + ',' + iterator.waybillNo; |
|
|
|
|
const _index = details.orderCodeList.indexOf(_code); |
|
|
|
|
// 删除映射的订单号+运单号 |
|
|
|
|
details.orderCodeList.splice(_index, 1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
item.lineCarsOrderList = []; |
|
|
|
|
item.renderData = []; |
|
|
|
|
|
|
|
|
|
details.page.pageNum = 1; |
|
|
|
|
initOriginWarehouseOrder(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 弹出层开启前清除数据 */ |
|
|
|
|
const beforeClose = done => { |
|
|
|
|
done(); |
|
|
|
|
@ -1180,7 +1186,6 @@ const handleNameChange = (type: number) => {
|
|
|
|
|
const findValue = type === 1 ? form.value.driverName : form.value.assistantName; |
|
|
|
|
|
|
|
|
|
const _value = details.driverListByName.find(value => value.driverId === findValue); |
|
|
|
|
console.log('_value :>> ', _value); |
|
|
|
|
if (type === 1) { |
|
|
|
|
form.value.driverName = _value.driverName; |
|
|
|
|
form.value.driverId = _value.driverId; |
|
|
|
|
@ -1195,7 +1200,6 @@ const handleNameChange = (type: number) => {
|
|
|
|
|
/** 车辆改变 */ |
|
|
|
|
const handleCarChange = (type: number) => { |
|
|
|
|
const _value = details.carListByName.find(value => value.carId === form.value.carNumber); |
|
|
|
|
console.log('_value :>> ', _value); |
|
|
|
|
form.value.carNumber = _value.carNumber; |
|
|
|
|
form.value.carId = _value.carId; |
|
|
|
|
}; |
|
|
|
|
@ -1260,11 +1264,8 @@ const handleAddNode = async (index: number) => {
|
|
|
|
|
loading: false, |
|
|
|
|
selectionChange(list, index) { |
|
|
|
|
details.nodeInfoData[index].selectionList = list; |
|
|
|
|
console.log('list :>> ', list); |
|
|
|
|
}, |
|
|
|
|
itemInputsc(value, row, index) { |
|
|
|
|
console.log('this :>> ', this); |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
// 动态设置正则 |
|
|
|
|
const reg = new RegExp(value, 'i'); |
|
|
|
|
@ -1307,7 +1308,6 @@ const handleAddNode = async (index: number) => {
|
|
|
|
|
|
|
|
|
|
/** 删除目的仓 */ |
|
|
|
|
const handleDelNode = (index: number, row) => { |
|
|
|
|
console.log('row :>> ', row); |
|
|
|
|
ElMessageBox.confirm('确认删除该节点吗?', '', { |
|
|
|
|
confirmButtonText: '确认', |
|
|
|
|
cancelButtonText: '取消', |
|
|
|
|
@ -1345,7 +1345,6 @@ const handleAddWaybill = async (index: number) => {
|
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
console.log('_node :>> ', _node); |
|
|
|
|
// 新增 |
|
|
|
|
if (Number(details.pageType) === 3) return; |
|
|
|
|
for (let item of details.selectionList) { |
|
|
|
|
@ -1364,8 +1363,6 @@ const handleAddWaybill = async (index: number) => {
|
|
|
|
|
|
|
|
|
|
_node.renderData = _node.lineCarsOrderList; |
|
|
|
|
|
|
|
|
|
console.log('details.orderCodeList :>> ', details.orderCodeList); |
|
|
|
|
|
|
|
|
|
clearSelectionList(); |
|
|
|
|
details.page.pageNum = 1; |
|
|
|
|
initOriginWarehouseOrder(); |
|
|
|
|
@ -1374,7 +1371,6 @@ const handleAddWaybill = async (index: number) => {
|
|
|
|
|
/** 移除调度池 */ |
|
|
|
|
const handleRemoveWaybill = async (index: number) => { |
|
|
|
|
const _node = details.nodeInfoData[index]; |
|
|
|
|
console.log('details.nodeInfoData[index] :>> ', details.nodeInfoData[index]); |
|
|
|
|
// 新增 |
|
|
|
|
|
|
|
|
|
if (!_node.nodeName || !_node.nodeId) { |
|
|
|
|
@ -1390,7 +1386,6 @@ const handleRemoveWaybill = async (index: number) => {
|
|
|
|
|
_node.lineCarsOrderList = _node.lineCarsOrderList.filter((val, index) => { |
|
|
|
|
// 修改 |
|
|
|
|
if (Number(details.pageType) === 2) { |
|
|
|
|
console.log('_node :>> ', _node); |
|
|
|
|
if (val.carsOrderId) { |
|
|
|
|
const _index = _node.MappingData.indexOf(val.carsOrderId); |
|
|
|
|
_node.MappingData.splice(_index, 1); |
|
|
|
|
@ -1420,7 +1415,6 @@ const remoteMethodDriver = async val => {
|
|
|
|
|
// if (!val) return; |
|
|
|
|
|
|
|
|
|
const res = await postFindDriverListByName({ driverName: val }); |
|
|
|
|
console.log('res :>> ', res); |
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
details.driverListByName = data; |
|
|
|
|
@ -1434,7 +1428,6 @@ const remoteMethodCar = async val => {
|
|
|
|
|
// if (!val) return; |
|
|
|
|
|
|
|
|
|
const res = await postFindCarListByName({ carNumber: val }); |
|
|
|
|
console.log('res :>> ', res); |
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
details.carListByName = data; |
|
|
|
|
@ -1443,12 +1436,10 @@ remoteMethodCar('');
|
|
|
|
|
|
|
|
|
|
/** 修改计划数 */ |
|
|
|
|
const handleEditplanNum = ({ row }, item) => { |
|
|
|
|
console.log('row :>> ', row); |
|
|
|
|
details.editInfo = row; |
|
|
|
|
details.editInfo.enterPlanNum = Number(row.planNum); |
|
|
|
|
details.editInfo.item = item; |
|
|
|
|
|
|
|
|
|
console.log('details.editInfo :>> ', details.editInfo); |
|
|
|
|
details.popUpShow.editPlanNumberVisited = true; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
@ -1548,7 +1539,6 @@ const addSubmit = async () => {
|
|
|
|
|
submitData.addCarsLoadLineList[0].addList = _lineCarsOrderList; |
|
|
|
|
submitData.addCarsLoadLineList[0].removeList = []; |
|
|
|
|
|
|
|
|
|
console.log('submitData :>> ', submitData); |
|
|
|
|
const res = await postSaveNew(submitData); |
|
|
|
|
const { code, msg } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
@ -1609,7 +1599,6 @@ const editSubmit = async () => {
|
|
|
|
|
val.sort = i + 1; |
|
|
|
|
|
|
|
|
|
const _index = details.allCarsLineList.indexOf(val.nodeId); |
|
|
|
|
console.log('_index :>> ', _index); |
|
|
|
|
if (_index === -1) { |
|
|
|
|
// 本节点为新增 |
|
|
|
|
val.updateType = 2; |
|
|
|
|
@ -1646,8 +1635,6 @@ const editSubmit = async () => {
|
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
console.log('_addArr.length :>> ', _addArr.length); |
|
|
|
|
console.log('val.MappingData.length :>> ', val.MappingData.length); |
|
|
|
|
// 存在删除数据或新增数据, 则该节点存在更新 |
|
|
|
|
if ((val.updateType !== 2 && _addArr.length > 0) || val.MappingData.length > 0) |
|
|
|
|
val.updateType = 1; |
|
|
|
|
@ -1660,11 +1647,6 @@ const editSubmit = async () => {
|
|
|
|
|
submitData.addCarsLoadLineList[details.active].addList = _lineCarsOrderList; |
|
|
|
|
submitData.addCarsLoadLineList[details.active].removeList = details._removeList; |
|
|
|
|
|
|
|
|
|
// const submitData = { loadId: details.loadId, ...details.form }; |
|
|
|
|
|
|
|
|
|
console.log('details.form :>> ', details.form); |
|
|
|
|
|
|
|
|
|
console.log('submitData :>> ', submitData); |
|
|
|
|
const res = await postUpdateCarsLoadBasicData(submitData); |
|
|
|
|
const { code, msg } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
@ -1673,7 +1655,6 @@ const editSubmit = async () => {
|
|
|
|
|
type: 'success', |
|
|
|
|
}); |
|
|
|
|
back(); |
|
|
|
|
// console.log('res :>> ', res); |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
@ -1693,11 +1674,6 @@ const nodeCostSubmit = async () => {
|
|
|
|
|
carsLoadLineList: details.nodeInfoData, |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
console.log('details.nodeInfoData :>> ', details.nodeInfoData); |
|
|
|
|
|
|
|
|
|
console.log('details.form :>> ', details.form); |
|
|
|
|
|
|
|
|
|
console.log('submitData :>> ', submitData); |
|
|
|
|
const res = await postUpdateLoadFeeByNodeId(submitData); |
|
|
|
|
const { code, msg } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
@ -1718,7 +1694,6 @@ const nodeCostSubmit = async () => {
|
|
|
|
|
const handleSubmit = (formEl: FormInstance | undefined) => { |
|
|
|
|
if (btnLoadingObj.submitBtn) return; |
|
|
|
|
if (!formEl) return; |
|
|
|
|
console.log('111 :>> ', 111); |
|
|
|
|
formEl.validate(async (valid, fields) => { |
|
|
|
|
if (valid) { |
|
|
|
|
try { |
|
|
|
|
|
