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] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86=E6=96=B0?=
=?UTF-8?q?=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',