From f764a196590fa171fbae0f387332c21713f697ae Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 26 Dec 2023 14:24:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../turndelivery/deliveryDiscuss.vue | 76 ------------------- .../parcelList/distributionParcelList.vue | 6 ++ 2 files changed, 6 insertions(+), 76 deletions(-) diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index f977afd7..1345f9aa 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -281,8 +281,6 @@ - -
{ -// const end = new Date(); -// const start = new Date(); -// start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); -// return [start, end]; -// }, -// }, -// { -// text: '最近一个月', -// value: () => { -// const end = new Date(); -// const start = new Date(); -// start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); -// return [start, end]; -// }, -// }, -// { -// text: '最近三个月', -// value: () => { -// const end = new Date(); -// const start = new Date(); -// start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); -// return [start, end]; -// }, -// }, -// ], -// /** 时间选择器数据 */ -// stockupDate: [], -// /** 列表 */ -// columnList, -// /** 列表数据 */ -// data: [{}], -// /** 页面loading */ -// loadingObj: { -// /** 列表加载loading */ -// list: false, -// packageListLoading: false, -// }, -// /** 列表复选框选中的数据 */ -// selectionList: [], -// /** 是否显示设置表格 */ -// drawerShow: false, -// /** 分页参数 */ -// page: { -// currentPage: 1, -// pageSize: 50, -// total: 0, -// }, -// }); - -// const { -// search, -// query, -// shortcuts, -// stockupDate, -// data, -// loadingObj, -// selectionList, -// drawerShow, -// page, -// trickleLoadingPage, -// zeroAdditionalRecordingInfo, -// popUpShow, -// recorddata, -// } = toRefs(details); const dataInfoID = ref(); //点击删除保存当前ID // 司机选择信息 // 车辆选项 diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue index 0891ab3c..df1a0523 100644 --- a/src/views/warehouse/parcelList/distributionParcelList.vue +++ b/src/views/warehouse/parcelList/distributionParcelList.vue @@ -393,6 +393,12 @@ export default { display: false, hide: true, }, + { + label: '签收时间', + prop: 'signingTime', + display: false, + hide: true, + }, { label: '配送车牌', prop: 'dvehicleName', From 470ae07d4793145af8010baf96b6a1c976120ff9 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 26 Dec 2023 15:06:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../turndelivery/deliveryDiscuss.vue | 7 +- .../parcelList/distributionParcelList.vue | 80 +++++++++++++++---- 2 files changed, 70 insertions(+), 17 deletions(-) diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 1345f9aa..9076e1c6 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -320,7 +320,7 @@ align="center" > @@ -1888,6 +1888,9 @@ const soclear=()=>{ } // 编辑多功能搜索 const SearchFu = () => { +return + document.getElementById(multifunctional.value).scrollIntoView() +return console.log(soInpuState.value, '当前搜索状态'); if (!multifunctional.value && !dataInfoTemp.value.length) { @@ -1930,7 +1933,7 @@ const SearchFu = () => { console.log(dataInfoTemp.value,'临时存储的值'); dataInfo.value = temp; //如果搜索到了值才赋值 soInpuState.value = false; //表示当前已经搜索过了 - + } // console.log(dataInfo.value, '搜索结果'); diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue index df1a0523..544eb224 100644 --- a/src/views/warehouse/parcelList/distributionParcelList.vue +++ b/src/views/warehouse/parcelList/distributionParcelList.vue @@ -369,35 +369,85 @@ export default { fixed: false, sortable: true, }, + + { - label: '预约单编号', prop: 'reservationCode', - display: false, - hide: true, + label: '预约单编号', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, }, + + { - label: '配送车次号', prop: 'noteNumber', - display: false, - hide: true, + label: '配送车次号', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, }, + + { - label: '配送司机', prop: 'driverName', - display: false, - hide: true, + label: '配送司机', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, }, + + { - label: '装车时间', prop: 'scanTime', - display: false, - hide: true, + label: '装车时间', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + + + { + prop: 'scanUser', + label: '实际装车人', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, }, { - label: '签收时间', prop: 'signingTime', - display: false, - hide: true, + label: '签收时间', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'signingUser', + label: '实际签收人', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, }, { label: '配送车牌',