|
|
|
|
@ -195,7 +195,7 @@
|
|
|
|
|
> |
|
|
|
|
<el-form-item class="el-times" label="开单时间"> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="stockupDate" |
|
|
|
|
v-model="details.query.timeQuery.createTime" |
|
|
|
|
type="daterange" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="-" |
|
|
|
|
@ -207,7 +207,7 @@
|
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item> |
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="searchReset()" |
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="handleData" |
|
|
|
|
>搜 索</el-button |
|
|
|
|
> |
|
|
|
|
<el-button icon="el-icon-delete" @click="searchReset()">重置</el-button> |
|
|
|
|
@ -237,12 +237,13 @@
|
|
|
|
|
<tablecmt |
|
|
|
|
ref="oldColumnListNode" |
|
|
|
|
:columnList="details.columnList" |
|
|
|
|
:tableData="details.oldData" |
|
|
|
|
:tableData="details.renderData" |
|
|
|
|
:loading="loadingObj.renderData" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@selection="selectionChange" |
|
|
|
|
:arraySpanMethod="row => arraySpanMethod(row)" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<template v-if="slotProps.scope.column.label === '运单号'"> |
|
|
|
|
@ -252,42 +253,6 @@
|
|
|
|
|
</template> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
|
|
|
|
|
<!-- <div class="flex"> |
|
|
|
|
<el-tabs |
|
|
|
|
v-model="details.type" |
|
|
|
|
tab-position="left" |
|
|
|
|
style="height: 100%; width: fit-content; flex: none" |
|
|
|
|
@tab-click="() => inputsc('', { prop: 'aaa' })" |
|
|
|
|
class="demo-tabs" |
|
|
|
|
> |
|
|
|
|
<el-tab-pane label="实际数据" name="real"></el-tab-pane> |
|
|
|
|
<el-tab-pane label="计划数据" name="plan"></el-tab-pane> |
|
|
|
|
</el-tabs> |
|
|
|
|
|
|
|
|
|
<div class="overflow"> |
|
|
|
|
<tablecmt |
|
|
|
|
class="w100" |
|
|
|
|
ref="oldColumnListNode" |
|
|
|
|
:columnList="details.columnList" |
|
|
|
|
:tableData="details.renderData" |
|
|
|
|
:loading="loadingObj.oldListLoading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@selection="selectionChange" |
|
|
|
|
:arraySpanMethod="row => arraySpanMethod(row)" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<template v-if="slotProps.scope.column.label === '运单号'"> |
|
|
|
|
<el-text @click="() => handleGoWayBillDetail(slotProps.scope)">{{ |
|
|
|
|
slotProps.scope.row.waybillNo |
|
|
|
|
}}</el-text> |
|
|
|
|
</template> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
</div> |
|
|
|
|
</div>--> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
|
|
|
|
|
<el-tab-pane label="操 作 日 志" name="tab2"> |
|
|
|
|
@ -331,7 +296,6 @@
|
|
|
|
|
</basic-container> |
|
|
|
|
|
|
|
|
|
<edittablehead |
|
|
|
|
@setcolum="setnewcolum" |
|
|
|
|
@closce="showdrawer" |
|
|
|
|
:drawerShow="drawerShow" |
|
|
|
|
v-model="details.columnList" |
|
|
|
|
@ -396,7 +360,14 @@ const details = reactive<any>({
|
|
|
|
|
/** 是否开启搜索 */ |
|
|
|
|
search: true, |
|
|
|
|
/** 表格搜索条件 */ |
|
|
|
|
query: {}, |
|
|
|
|
query: { |
|
|
|
|
/** 输入框搜索 */ |
|
|
|
|
inputQuery: {}, |
|
|
|
|
/** 下拉框搜索 */ |
|
|
|
|
selectQuery: {}, |
|
|
|
|
/** 时间搜索 */ |
|
|
|
|
timeQuery: {}, |
|
|
|
|
}, |
|
|
|
|
/** 时间快捷选择设置 */ |
|
|
|
|
shortcuts: [ |
|
|
|
|
{ |
|
|
|
|
@ -631,25 +602,8 @@ const onLoad = debounce(async () => {
|
|
|
|
|
delete details.form.carrierTime; |
|
|
|
|
delete details.form.receivingTime; |
|
|
|
|
|
|
|
|
|
// data1.carsLoadWaybillInfoList.forEach(val => { |
|
|
|
|
// details.oldData.push( |
|
|
|
|
// ...val.carsLoadOrderInfoList.map((item, index) => { |
|
|
|
|
// item = { ...val, ...item }; |
|
|
|
|
// const _planArr: any = { ...val, ...item }; |
|
|
|
|
// delete item.carsLoadOrderInfoList; |
|
|
|
|
// delete item.carsLoadOrderInfoListPlan; |
|
|
|
|
|
|
|
|
|
// if (index === 0) item.mergeColumnIndex = val.carsLoadOrderInfoList.length; |
|
|
|
|
// else { |
|
|
|
|
// item.mergeColumnIndex = 0; |
|
|
|
|
// for (let value of mergeColumn) { |
|
|
|
|
// item[value] = ''; |
|
|
|
|
// } |
|
|
|
|
// } |
|
|
|
|
// return item; |
|
|
|
|
// }) |
|
|
|
|
// ); |
|
|
|
|
// }); |
|
|
|
|
details.oldData = []; |
|
|
|
|
details.planData = []; |
|
|
|
|
|
|
|
|
|
data1.carsLoadWaybillInfoList.forEach(val => { |
|
|
|
|
details.oldData.push( |
|
|
|
|
@ -671,7 +625,7 @@ const onLoad = debounce(async () => {
|
|
|
|
|
); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
// await initOriginWarehouseOrder(); |
|
|
|
|
handleData(); |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
@ -681,26 +635,6 @@ const onLoad = debounce(async () => {
|
|
|
|
|
|
|
|
|
|
onLoad(); |
|
|
|
|
|
|
|
|
|
/** 请求运单数据 */ |
|
|
|
|
const initOriginWarehouseOrder = async (params = {}) => { |
|
|
|
|
try { |
|
|
|
|
// 开启列表加载动画 |
|
|
|
|
const submitData = { |
|
|
|
|
loadId: $route.query.loadId, |
|
|
|
|
finalNodeId: details.form.startWarehouseId, |
|
|
|
|
}; |
|
|
|
|
const res = await postFindUseOrderList(submitData); |
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
details.oldData = data; |
|
|
|
|
details.renderData = data; |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
details.loadingObj.oldListLoading = false; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 搜索 */ |
|
|
|
|
const searchChange = () => { |
|
|
|
|
onLoad(); |
|
|
|
|
@ -716,13 +650,6 @@ const searchReset = () => {
|
|
|
|
|
handleData(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
// 清空复选框 |
|
|
|
|
const clearSelectionList = () => { |
|
|
|
|
details.selectionList = []; |
|
|
|
|
details.newSelectionList = []; |
|
|
|
|
oldColumnListNode.value.handleCheckSelect([]); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 展开列表控件 */ |
|
|
|
|
const showdrawer = (_flag?: boolean, _type?: number) => { |
|
|
|
|
switch (_type) { |
|
|
|
|
@ -832,24 +759,6 @@ const selectionChange = (list: any) => {
|
|
|
|
|
details.selectionList = list; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 设置列表 -- 固定函数 |
|
|
|
|
* 弹窗的勾选回调，用于更改头部数组 |
|
|
|
|
* 固定搭配，只需要更换 columnList |
|
|
|
|
* */ |
|
|
|
|
const setnewcolum = (newarr, headarr, type) => { |
|
|
|
|
if (type == 1) { |
|
|
|
|
details.columnList = newarr; |
|
|
|
|
functions.setStorage(window.location.pathname + 'checkList', headarr); |
|
|
|
|
} else if (type == 2) { |
|
|
|
|
details.columnList = newarr; |
|
|
|
|
functions.setStorage(window.location.pathname + 'flexList', headarr); |
|
|
|
|
} else if (type == 3) { |
|
|
|
|
details.columnList = newarr; |
|
|
|
|
functions.setStorage(window.location.pathname + 'sortlist', headarr); |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 司机改变时 */ |
|
|
|
|
const handleNameChange = () => { |
|
|
|
|
const findValue = form.value.driverName; |
|
|
|
|
|
