|
|
|
|
@ -187,6 +187,7 @@
|
|
|
|
|
<div class="form_row_item"> |
|
|
|
|
<el-form-item inline label="合计运费"> |
|
|
|
|
<el-input-number |
|
|
|
|
:controls="false" |
|
|
|
|
v-model="form.countTransportCost" |
|
|
|
|
controls-position="right" |
|
|
|
|
:precision="2" |
|
|
|
|
@ -225,6 +226,7 @@
|
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-input-number |
|
|
|
|
:controls="false" |
|
|
|
|
controls-position="right" |
|
|
|
|
:precision="2" |
|
|
|
|
:min="0" |
|
|
|
|
@ -327,6 +329,7 @@
|
|
|
|
|
class="columnList" |
|
|
|
|
:columnList="details.columnList" |
|
|
|
|
:tableData="details.data" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
:loading="loadingObj.oldListLoading" |
|
|
|
|
@selection="selectionChange" |
|
|
|
|
> |
|
|
|
|
@ -431,14 +434,16 @@
|
|
|
|
|
<tablecmt |
|
|
|
|
class="columnList" |
|
|
|
|
ref="newColumnListNode" |
|
|
|
|
:columnList="details.newColumnList" |
|
|
|
|
:tableData="item.lineCarsOrderList" |
|
|
|
|
:columnList="item.newColumnList" |
|
|
|
|
:tableData="item.renderData" |
|
|
|
|
:loading="item.loading" |
|
|
|
|
@inputTxt="(value, row) => item.itemInputsc(value, row, index)" |
|
|
|
|
@selection="list => item.selectionChange(list, index)" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<template v-if="slotProps.scope.column.label === '计划数'"> |
|
|
|
|
<el-input-number |
|
|
|
|
:controls="false" |
|
|
|
|
v-if="Number(details.pageType) === 1" |
|
|
|
|
v-model="slotProps.scope.row.planNum" |
|
|
|
|
controls-position="right" |
|
|
|
|
@ -508,6 +513,7 @@
|
|
|
|
|
<el-form> |
|
|
|
|
<el-form-item label="计划数量：" label-width="100px"> |
|
|
|
|
<el-input-number |
|
|
|
|
:controls="false" |
|
|
|
|
controls-position="right" |
|
|
|
|
:min="0" |
|
|
|
|
:precision="0" |
|
|
|
|
@ -519,7 +525,7 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
<div class="flex-c-c"> |
|
|
|
|
<el-button>取消</el-button> |
|
|
|
|
<el-button @click="details.popUpShow.editPlanNumberVisited = false">取消</el-button> |
|
|
|
|
<el-button |
|
|
|
|
type="primary" |
|
|
|
|
:loading="btnLoadingObj.editPlanNumBtn" |
|
|
|
|
@ -539,7 +545,7 @@ import dayjs from 'dayjs';
|
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
/** 获取字典 */ |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import { downloadXls, setNodeHeight, computeNumber, isNumer } from '@/utils/util'; |
|
|
|
|
import { downloadXls, setNodeHeight, computeNumber, isNumer, deepClone } from '@/utils/util'; |
|
|
|
|
import { |
|
|
|
|
columnList, |
|
|
|
|
nodeInfoColumnList, |
|
|
|
|
@ -865,6 +871,7 @@ const initDispatchOrder = async item => {
|
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
item.lineCarsOrderList = data; |
|
|
|
|
item.renderData = data; |
|
|
|
|
} catch (error) { |
|
|
|
|
} finally { |
|
|
|
|
// 关闭列表加载动画 |
|
|
|
|
@ -908,25 +915,108 @@ const onLoad = async () => {
|
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
details.nodeInfoData = handleEditForbidden( |
|
|
|
|
data.allCarsLineList.map((val, index) => { |
|
|
|
|
const _node = { |
|
|
|
|
...val, |
|
|
|
|
// 筛选 |
|
|
|
|
query: {}, |
|
|
|
|
// 复选框 |
|
|
|
|
selectionList: [], |
|
|
|
|
// 参数 |
|
|
|
|
lineCarsOrderList: [], |
|
|
|
|
/** 渲染数据 */ |
|
|
|
|
renderData: [], |
|
|
|
|
filterData: [], |
|
|
|
|
// 克隆表头 |
|
|
|
|
newColumnList: deepClone(newColumnList), |
|
|
|
|
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'); |
|
|
|
|
|
|
|
|
|
this.query[row.prop] = reg; |
|
|
|
|
|
|
|
|
|
if (value === '') delete this.query[row.prop]; |
|
|
|
|
|
|
|
|
|
if (Object.keys(this.query).length === 0) |
|
|
|
|
return (this.renderData = this.lineCarsOrderList); |
|
|
|
|
|
|
|
|
|
const _data = this.lineCarsOrderList.filter(value => { |
|
|
|
|
let _flag = true; |
|
|
|
|
for (let key in this.query) { |
|
|
|
|
if (!this.query[key].test(value[key])) _flag = false; |
|
|
|
|
if (!_flag) break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return _flag; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
this.renderData = _data; |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
if (val.nodeName === data.warehouseName) { |
|
|
|
|
// 显示当前节点 |
|
|
|
|
details.warehouseIndex = index; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 筛选 |
|
|
|
|
val.query = {}; |
|
|
|
|
// 复选框 |
|
|
|
|
val.selectionList = []; |
|
|
|
|
// 参数 |
|
|
|
|
val.lineCarsOrderList = []; |
|
|
|
|
val.filterData = []; |
|
|
|
|
val.loading = false; |
|
|
|
|
val.selectionChange = (list, index) => { |
|
|
|
|
details.nodeInfoData[index].selectionList = list; |
|
|
|
|
console.log('list :>> ', list); |
|
|
|
|
}; |
|
|
|
|
if (Number(details.pageType) === 2) initDispatchOrder(val); |
|
|
|
|
return val; |
|
|
|
|
// // 筛选 |
|
|
|
|
// val.query = {}; |
|
|
|
|
// // 复选框 |
|
|
|
|
// val.selectionList = []; |
|
|
|
|
// // 参数 |
|
|
|
|
// val.lineCarsOrderList = []; |
|
|
|
|
// // 渲染列表 |
|
|
|
|
// val.renderData = []; |
|
|
|
|
// val.newColumnList = deepClone(newColumnList); |
|
|
|
|
// val.filterData = []; |
|
|
|
|
// val.loading = false; |
|
|
|
|
// val.selectionChange = (list, index) => { |
|
|
|
|
// details.nodeInfoData[index].selectionList = list; |
|
|
|
|
// console.log('list :>> ', list); |
|
|
|
|
// }; |
|
|
|
|
// val.itemInputsc = (value, row, index) => { |
|
|
|
|
// console.log('this :>> ', this); |
|
|
|
|
// try { |
|
|
|
|
// // 动态设置正则 |
|
|
|
|
// const reg = new RegExp(value, 'i'); |
|
|
|
|
|
|
|
|
|
// this.query[row.prop] = reg; |
|
|
|
|
|
|
|
|
|
// if (value === '') delete this.query[row.prop]; |
|
|
|
|
|
|
|
|
|
// if (Object.keys(this.query).length === 0) |
|
|
|
|
// return (this.renderData = this.lineCarsOrderList); |
|
|
|
|
|
|
|
|
|
// const _data = this.lineCarsOrderList.filter(value => { |
|
|
|
|
// let _flag = true; |
|
|
|
|
// for (let key in this.query) { |
|
|
|
|
// if (!this.query[key].test(value[key])) _flag = false; |
|
|
|
|
// if (!_flag) break; |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
// return _flag; |
|
|
|
|
// }); |
|
|
|
|
|
|
|
|
|
// this.renderData = _data; |
|
|
|
|
// } catch (error) { |
|
|
|
|
// console.log('error :>> ', error); |
|
|
|
|
// } finally { |
|
|
|
|
// } |
|
|
|
|
// }; |
|
|
|
|
|
|
|
|
|
if (Number(details.pageType) === 2) initDispatchOrder(_node); |
|
|
|
|
return _node; |
|
|
|
|
}) |
|
|
|
|
); |
|
|
|
|
details.form = data.carsLoadEntity; |
|
|
|
|
@ -993,6 +1083,8 @@ const searchHide = () => {
|
|
|
|
|
/** 表格表头输入框搜索 */ |
|
|
|
|
const inputsc = (index, row) => { |
|
|
|
|
details.query[row.prop] = index; |
|
|
|
|
console.log('111 :>> ', 111); |
|
|
|
|
if (index === '') delete details.query[row.prop]; |
|
|
|
|
initOriginWarehouseOrder(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
@ -1143,12 +1235,45 @@ const handleAddNode = () => {
|
|
|
|
|
selectionList: [], |
|
|
|
|
// 参数 |
|
|
|
|
lineCarsOrderList: [], |
|
|
|
|
/** 渲染数据 */ |
|
|
|
|
renderData: [], |
|
|
|
|
filterData: [], |
|
|
|
|
// 克隆表头 |
|
|
|
|
newColumnList: deepClone(newColumnList), |
|
|
|
|
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'); |
|
|
|
|
|
|
|
|
|
this.query[row.prop] = reg; |
|
|
|
|
|
|
|
|
|
if (value === '') delete this.query[row.prop]; |
|
|
|
|
|
|
|
|
|
if (Object.keys(this.query).length === 0) return (this.renderData = this.lineCarsOrderList); |
|
|
|
|
|
|
|
|
|
const _data = this.lineCarsOrderList.filter(value => { |
|
|
|
|
let _flag = true; |
|
|
|
|
for (let key in this.query) { |
|
|
|
|
if (!this.query[key].test(value[key])) _flag = false; |
|
|
|
|
if (!_flag) break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return _flag; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
this.renderData = _data; |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
}); |
|
|
|
|
details.nodeInfoData = handleEditForbidden(details.nodeInfoData); |
|
|
|
|
// 始发仓没有数据时, 请求数据 |
|
|
|
|
@ -1189,6 +1314,9 @@ const handleAddWaybill = async (index: number) => {
|
|
|
|
|
...details.selectionList.map(val => val.orderCode + ',' + val.waybillNo), |
|
|
|
|
]), |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
_node.renderData = _node.lineCarsOrderList; |
|
|
|
|
|
|
|
|
|
console.log('details.orderCodeList :>> ', details.orderCodeList); |
|
|
|
|
|
|
|
|
|
const orderCodes = details.selectionList.map(val => val.orderCode); |
|
|
|
|
@ -1237,10 +1365,12 @@ const handleRemoveWaybill = async (index: number) => {
|
|
|
|
|
message: '未选择目的仓或目的仓信息异常', |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
console.log('_node :>> ', _node); |
|
|
|
|
// 浅拷贝被选中的数据 |
|
|
|
|
const _selectList = [..._node.selectionList]; |
|
|
|
|
|
|
|
|
|
// 将被选中的数据筛选出去 |
|
|
|
|
_node.lineCarsOrderList = _node.lineCarsOrderList.filter((val, index) => { |
|
|
|
|
const _flag = !_node.selectionList.includes(val); |
|
|
|
|
const _flag = !_selectList.includes(val); |
|
|
|
|
if (!_flag) { |
|
|
|
|
const _code = val.orderCode + ',' + val.waybillNo; |
|
|
|
|
const _index = details.orderCodeList.indexOf(_code); |
|
|
|
|
@ -1249,6 +1379,11 @@ const handleRemoveWaybill = async (index: number) => {
|
|
|
|
|
} |
|
|
|
|
return _flag; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
_node.renderData = _node.renderData.filter((val, index) => { |
|
|
|
|
const _flag = !_selectList.includes(val); |
|
|
|
|
return _flag; |
|
|
|
|
}); |
|
|
|
|
clearSelectionList(); |
|
|
|
|
initOriginWarehouseOrder(); |
|
|
|
|
} |
|
|
|
|
@ -1256,7 +1391,7 @@ const handleRemoveWaybill = async (index: number) => {
|
|
|
|
|
else if (Number(details.pageType) === 2) { |
|
|
|
|
console.log('_node :>> ', _node); |
|
|
|
|
const submitData = { |
|
|
|
|
carsOrderId: _node.selectionList.map(val => val.carsOrderId).join(','), |
|
|
|
|
carsOrderIds: _node.selectionList.map(val => val.carsOrderId).join(','), |
|
|
|
|
}; |
|
|
|
|
const res = await postRemoveCarsOrderByCarsOrderId(submitData); |
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
@ -1310,7 +1445,7 @@ const handleSubmitEdit = async () => {
|
|
|
|
|
btnLoadingObj.editPlanNumBtn = true; |
|
|
|
|
|
|
|
|
|
const submitData = { |
|
|
|
|
carsOrderId: details.editInfo.carsOrderId, |
|
|
|
|
carsOrderIds: details.editInfo.carsOrderId, |
|
|
|
|
planNum: details.editInfo.enterPlanNum, |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
