From 6e7bef1170d45db3db09044cc32b339d027442a4 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Wed, 6 Nov 2024 17:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E6=94=B6=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=92=8C=E6=96=B0=E5=A2=9E=E9=85=8D=E8=BD=BD=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/distribution/addVehicleStowage.js | 38 +++++++------------ .../artery/VehicleArrivalManagement.vue | 1 + .../distribution/artery/VehicleStowage.vue | 1 + .../artery/VehicleStowageDetails.vue | 2 + .../signfor/distributionSignfor.vue | 2 +- .../signfor/distributionSignforedt.vue | 3 +- .../signfor/distributionSignfortreat.vue | 2 +- src/views/mail/signfor/list.vue | 2 +- 8 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js index 6b6fd704..e4e43a74 100644 --- a/src/option/distribution/addVehicleStowage.js +++ b/src/option/distribution/addVehicleStowage.js @@ -667,17 +667,6 @@ export const detailsColumnList = [ fixed: true, isshowSummary: true, }, - // { - // prop: 'carsNo', - // label: '配载车次号', - // type: 1, - // values: '', - // width: '130', - // checkarr: [], - // fixed: true, - // sortable: true, - // isshowSummary: false, - // }, { prop: 'waybillNo', label: '运单号', @@ -701,15 +690,15 @@ export const detailsColumnList = [ sortable: true, }, { - prop: 'createTime', - label: '开单日期', + prop: 'carsNo', + label: '配载车次号', type: 1, values: '', width: '130', checkarr: [], fixed: false, sortable: true, - head: false, + isshowSummary: false, }, { prop: 'destination', @@ -961,16 +950,6 @@ export const detailsColumnList = [ // isshowSummary: true, sortable: true, }, - { - prop: 'createTime', - label: '开单时间', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, { prop: 'weight', label: '重量(KG)', @@ -1112,6 +1091,17 @@ export const detailsColumnList = [ isColumnMerge: true, sortable: true, }, + { + prop: 'createTime', + label: '开单日期', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'checkStatusName', label: '审核状态', diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index 7820168e..4d0a140c 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -1164,6 +1164,7 @@ const handleGoWaybill = ({ row }) => { path: '/distribution/artery/VehicleStowageDetails', query: { loadId: row.id, + carsNo: row.carsNo, name: `${row.carsNo} - 配载详情`, }, }); diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index 0aab4598..f26959df 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -1136,6 +1136,7 @@ const handleGoWaybill = ({ row }) => { path: '/distribution/artery/VehicleStowageDetails', query: { loadId: row.id, + carsNo: row.carsNo, name: `${row.carsNo} - 配载详情`, }, }); diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue index 9a0ddd31..e7aff9c5 100644 --- a/src/views/distribution/artery/VehicleStowageDetails.vue +++ b/src/views/distribution/artery/VehicleStowageDetails.vue @@ -715,6 +715,7 @@ const initOriginWarehouseOrder = async () => { details.oldData.push( ...val.carsLoadOrderInfoList.map((item, index) => { item = { ...val, ...item }; + item.carsNo = $route.query.carsNo; delete item.carsLoadOrderInfoList; delete item.carsLoadOrderInfoListPlan; return item; @@ -724,6 +725,7 @@ const initOriginWarehouseOrder = async () => { details.planData.push( ...val.carsLoadOrderInfoListPlan.map((item, index) => { item = { ...val, ...item }; + item.carsNo = $route.query.carsNo; delete item.carsLoadOrderInfoList; delete item.carsLoadOrderInfoListPlan; return item; diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue index 0c391d58..bc0ab5c3 100644 --- a/src/views/distribution/signfor/distributionSignfor.vue +++ b/src/views/distribution/signfor/distributionSignfor.vue @@ -845,7 +845,7 @@ export default { query: { id: row.id, reservationId: row.reservationId, - row: JSON.stringify(row), + // row: JSON.stringify(row), name: '签收查看', }, }); diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue index e992d67c..2f38b7ea 100644 --- a/src/views/distribution/signfor/distributionSignforedt.vue +++ b/src/views/distribution/signfor/distributionSignforedt.vue @@ -1863,7 +1863,7 @@ const pageRow = ref({}); //页面参数 const onLoad = () => { menuData.value = menuData1.value; //页面初始化默认显示第一个表格 data.value = InitializeTable.value; //默认显示第一个表格数据 - pageRow.value = JSON.parse(route.query.row); + // pageRow.value = JSON.parse(route.query.row); }; console.log(route.query, 'route.query'); @@ -2188,6 +2188,7 @@ getDetail(RouterId.value).then(res => { // InitializeTable.value = res.data.data.orderInfo; //表格数据(订单列表) Tabs.value[0].data = res.data.data.orderInfo || []; //表格数据(订单列表) Tabs.value[0].renderData = res.data.data.orderInfo || []; + pageRow.value = res.data.data; onLoad(); // 照片回显分类 DoorstepPhoto.value = []; diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index 4ee1b141..36a68dde 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -2336,7 +2336,7 @@ export default { id: row.id, reservationId: row.reservationId, name: '待签收查看', - row: JSON.stringify(row), + // row: JSON.stringify(row), }, }); }, diff --git a/src/views/mail/signfor/list.vue b/src/views/mail/signfor/list.vue index 4b678964..3a31a4aa 100644 --- a/src/views/mail/signfor/list.vue +++ b/src/views/mail/signfor/list.vue @@ -782,7 +782,7 @@ export default { query: { id: row.id, reservationId: row.reservationId, - row:JSON.stringify(row), + // row:JSON.stringify(row), name: '签收查看', }, });